Skip to content

'Fix' macOS build errors, TestXDG folder cleanup #988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 131 additions & 6 deletions Foundation.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,9 @@
7900433B1CACD33E00ECCBF1 /* TestNSCompoundPredicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790043391CACD33E00ECCBF1 /* TestNSCompoundPredicate.swift */; };
7900433C1CACD33E00ECCBF1 /* TestNSPredicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7900433A1CACD33E00ECCBF1 /* TestNSPredicate.swift */; };
90E645DF1E4C89A400D0D47C /* TestNSCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90E645DE1E4C89A400D0D47C /* TestNSCache.swift */; };
9F0DD3521ECD73D000F68030 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F0041781ECD5962004138BD /* main.swift */; };
9F0DD3531ECD73D200F68030 /* XDGTestHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F4ADBD21ECD506E001F0B3D /* XDGTestHelper.swift */; };
9F0DD3571ECD783500F68030 /* SwiftFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B5D885D1BBC938800234F36 /* SwiftFoundation.framework */; };
A058C2021E529CF100B07AA1 /* TestMassFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A058C2011E529CF100B07AA1 /* TestMassFormatter.swift */; };
AE35A1861CBAC85E0042DB84 /* SwiftFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = AE35A1851CBAC85E0042DB84 /* SwiftFoundation.h */; settings = {ATTRIBUTES = (Public, ); }; };
B9974B961EDF4A22007F15B8 /* TransferState.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9974B8F1EDF4A22007F15B8 /* TransferState.swift */; };
Expand Down Expand Up @@ -760,6 +763,11 @@
84BA558D1C16F90900F48C54 /* TestNSTimeZone.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSTimeZone.swift; sourceTree = "<group>"; };
88D28DE61C13AE9000494606 /* TestNSGeometry.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSGeometry.swift; sourceTree = "<group>"; };
90E645DE1E4C89A400D0D47C /* TestNSCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSCache.swift; sourceTree = "<group>"; };
9F0041781ECD5962004138BD /* main.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
9F0DD33F1ECD734200F68030 /* xdgTestHelper.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = xdgTestHelper.app; sourceTree = BUILT_PRODUCTS_DIR; };
9F0DD34F1ECD737B00F68030 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
9F4ADBB61ECD445E001F0B3D /* SymbolAliases */ = {isa = PBXFileReference; lastKnownFileType = text; path = SymbolAliases; sourceTree = "<group>"; };
9F4ADBD21ECD506E001F0B3D /* XDGTestHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = XDGTestHelper.swift; path = ../XDGTestHelper.swift; sourceTree = "<group>"; };
A058C2011E529CF100B07AA1 /* TestMassFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestMassFormatter.swift; sourceTree = "<group>"; };
A5A34B551C18C85D00FD972B /* TestNSByteCountFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSByteCountFormatter.swift; sourceTree = "<group>"; };
AE35A1851CBAC85E0042DB84 /* SwiftFoundation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SwiftFoundation.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -928,6 +936,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
9F0DD33C1ECD734200F68030 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9F0DD3571ECD783500F68030 /* SwiftFoundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
EA66F66C1BF56CCB00136161 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -978,6 +994,7 @@
5BDC405C1BD6D83B00ED97BB /* TestFoundation.app */,
5B7C8A6E1BEA7F8F00C5B690 /* libCoreFoundation.a */,
EA66F66F1BF56CCB00136161 /* plutil */,
9F0DD33F1ECD734200F68030 /* xdgTestHelper.app */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -1019,6 +1036,7 @@
5B5D895B1BBDAB7E00234F36 /* CoreFoundation.h */,
5B5D88C61BBC983600234F36 /* ForFoundationOnly.h */,
5BF7AEC21BCD568D008F214A /* ForSwiftFoundationOnly.h */,
9F4ADBB61ECD445E001F0B3D /* SymbolAliases */,
EA66F6321BEECC7400136161 /* SwiftRuntime */,
);
name = Base;
Expand Down Expand Up @@ -1298,6 +1316,16 @@
path = Foundation;
sourceTree = "<group>";
};
9F4ADBCF1ECD4F56001F0B3D /* xdgTestHelper */ = {
isa = PBXGroup;
children = (
9F0DD34F1ECD737B00F68030 /* Info.plist */,
9F4ADBD21ECD506E001F0B3D /* XDGTestHelper.swift */,
9F0041781ECD5962004138BD /* main.swift */,
);
path = xdgTestHelper;
sourceTree = "<group>";
};
E4F889331E9CF04D008A70EB /* http */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1327,6 +1355,7 @@
children = (
1520469A1D8AEABE00D02E36 /* HTTPServer.swift */,
EA66F6381BF1619600136161 /* main.swift */,
9F4ADBCF1ECD4F56001F0B3D /* xdgTestHelper */,
EA66F65A1BF1976100136161 /* Tests */,
EA66F6391BF1619600136161 /* Resources */,
);
Expand Down Expand Up @@ -1911,6 +1940,23 @@
productReference = 5BDC405C1BD6D83B00ED97BB /* TestFoundation.app */;
productType = "com.apple.product-type.bundle";
};
9F0DD33E1ECD734200F68030 /* xdgTestHelper */ = {
isa = PBXNativeTarget;
buildConfigurationList = 9F0DD34B1ECD734200F68030 /* Build configuration list for PBXNativeTarget "xdgTestHelper" */;
buildPhases = (
9F0DD33B1ECD734200F68030 /* Sources */,
9F0DD33C1ECD734200F68030 /* Frameworks */,
9F0DD33D1ECD734200F68030 /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = xdgTestHelper;
productName = xdgTestHelper;
productReference = 9F0DD33F1ECD734200F68030 /* xdgTestHelper.app */;
productType = "com.apple.product-type.application";
};
EA66F66E1BF56CCB00136161 /* plutil */ = {
isa = PBXNativeTarget;
buildConfigurationList = EA66F6751BF56CCB00136161 /* Build configuration list for PBXNativeTarget "plutil" */;
Expand All @@ -1934,8 +1980,8 @@
5B5D88541BBC938800234F36 /* Project object */ = {
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0720;
LastUpgradeCheck = 0800;
LastSwiftUpdateCheck = 0830;
LastUpgradeCheck = 0830;
ORGANIZATIONNAME = Apple;
TargetAttributes = {
5B5D885C1BBC938800234F36 = {
Expand All @@ -1955,6 +2001,10 @@
LastSwiftUpdateCheck = 0800;
ProvisioningStyle = Manual;
};
9F0DD33E1ECD734200F68030 = {
CreatedOnToolsVersion = 8.3.2;
ProvisioningStyle = Automatic;
};
EA66F66E1BF56CCB00136161 = {
CreatedOnToolsVersion = 7.1;
LastSwiftMigration = 0800;
Expand All @@ -1969,6 +2019,7 @@
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = 5B5D88531BBC938800234F36;
productRefGroup = 5B5D885E1BBC938800234F36 /* Products */;
Expand All @@ -1979,6 +2030,7 @@
5BDC405B1BD6D83B00ED97BB /* TestFoundation */,
5B7C8A6D1BEA7F8F00C5B690 /* CoreFoundation */,
EA66F66E1BF56CCB00136161 /* plutil */,
9F0DD33E1ECD734200F68030 /* xdgTestHelper */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -2014,6 +2066,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
9F0DD33D1ECD734200F68030 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down Expand Up @@ -2343,6 +2402,15 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
9F0DD33B1ECD734200F68030 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
9F0DD3521ECD73D000F68030 /* main.swift in Sources */,
9F0DD3531ECD73D200F68030 /* XDGTestHelper.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
EA66F66B1BF56CCB00136161 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -2520,7 +2588,7 @@
r,
r,
);
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -swift-version 3";
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -swift-version 3";
PRODUCT_BUNDLE_IDENTIFIER = org.swift.Foundation;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -2593,7 +2661,7 @@
r,
r,
);
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -swift-version 3";
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -swift-version 3";
PRODUCT_BUNDLE_IDENTIFIER = org.swift.Foundation;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -2636,6 +2704,8 @@
"-DCF_CHARACTERSET_UNICODE_DATA_B=\\\\\"CoreFoundation/CharacterSets/CFUnicodeData-B.mapping\\\\\"",
"-DCF_CHARACTERSET_UNICHAR_DB=\\\\\"CoreFoundation/CharacterSets/CFUniCharPropertyDatabase.data\\\\\"",
"-DCF_CHARACTERSET_BITMAP=\\\\\"CoreFoundation/CharacterSets/CFCharacterSetBitmaps.bitmap\\\\\"",
"-Wno-nullability-completeness-on-arrays",
"-Wno-format-security",
);
PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/CoreFoundation;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -2676,6 +2746,8 @@
"-DCF_CHARACTERSET_UNICODE_DATA_B=\\\\\"CoreFoundation/CharacterSets/CFUnicodeData-B.mapping\\\\\"",
"-DCF_CHARACTERSET_UNICHAR_DB=\\\\\"CoreFoundation/CharacterSets/CFUniCharPropertyDatabase.data\\\\\"",
"-DCF_CHARACTERSET_BITMAP=\\\\\"CoreFoundation/CharacterSets/CFCharacterSetBitmaps.bitmap\\\\\"",
"-Wno-nullability-completeness-on-arrays",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did we need to turn these off, instead of maybe fixing the warnings?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auditing CF for these warnings may be worthwhile, but I'm thinking it'll take quite a bit of time to fix+review. Meanwhile, there is a lot of noise; in particular, no-format-security flags CFSTRs which look fine.

"-Wno-format-security",
);
PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/CoreFoundation;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -2697,8 +2769,9 @@
);
INFOPLIST_FILE = TestFoundation/Resources/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
LIBRARY_SEARCH_PATHS = "$(inherited)";
MACH_O_TYPE = mh_execute;
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -swift-version 3";
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -swift-version 3";
PRODUCT_BUNDLE_IDENTIFIER = org.swift.TestFoundation;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand All @@ -2721,8 +2794,9 @@
);
INFOPLIST_FILE = TestFoundation/Resources/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
LIBRARY_SEARCH_PATHS = "$(inherited)";
MACH_O_TYPE = mh_execute;
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -swift-version 3";
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -swift-version 3";
PRODUCT_BUNDLE_IDENTIFIER = org.swift.TestFoundation;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand All @@ -2731,6 +2805,48 @@
};
name = Release;
};
9F0DD34C1ECD734200F68030 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CODE_SIGN_IDENTITY = "";
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = TestFoundation/xdgTestHelper/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../../.. @loader_path/../../.. @executable_path/../Frameworks";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This path is wacky. Is that really the right value?

Copy link
Contributor Author

@e78l e78l May 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm adding SwiftFoundation at the level of the build directory, so for the executable at:
Build/Products/Debug/xdgTestHelper.app/Contents/MacOS/xdgTestHelper
look for framework at:
Build/Products/Debug/SwiftFoundation.framework
Could also just copy the framework into @executable_path/../Frameworks but that seems unnecessary to me

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This xdgTestHelper was only being built on Linux before, but this ports it as a .app to macOS right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

MACOSX_DEPLOYMENT_TARGET = 10.12;
PRODUCT_BUNDLE_IDENTIFIER = org.swift.xdgTestHelper;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
9F0DD34D1ECD734200F68030 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CODE_SIGN_IDENTITY = "";
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = TestFoundation/xdgTestHelper/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../../.. @loader_path/../../.. @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.12;
PRODUCT_BUNDLE_IDENTIFIER = org.swift.xdgTestHelper;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Release;
};
EA66F6731BF56CCB00136161 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -2793,6 +2909,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
9F0DD34B1ECD734200F68030 /* Build configuration list for PBXNativeTarget "xdgTestHelper" */ = {
isa = XCConfigurationList;
buildConfigurations = (
9F0DD34C1ECD734200F68030 /* Debug */,
9F0DD34D1ECD734200F68030 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
EA66F6751BF56CCB00136161 /* Build configuration list for PBXNativeTarget "plutil" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0830"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0830"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0830"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
Expand Down Expand Up @@ -48,6 +48,20 @@
ReferencedContainer = "container:Foundation.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9F0DD33E1ECD734200F68030"
BuildableName = "xdgTestHelper.app"
BlueprintName = "xdgTestHelper"
ReferencedContainer = "container:Foundation.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0830"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
Expand Down
4 changes: 3 additions & 1 deletion TestFoundation/TestNSHTTPCookieStorage.swift
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,8 @@ class TestNSHTTPCookieStorage: XCTestCase {
let task = Process()
task.launchPath = bundlePath.substring(to: pathIndex!) + "/xdgTestHelper/xdgTestHelper"
var environment = ProcessInfo.processInfo.environment
environment["XDG_DATA_HOME"] = NSHomeDirectory() + "/TestXDG"
let testPath = NSHomeDirectory() + "/TestXDG"
environment["XDG_CONFIG_HOME"] = testPath
task.environment = environment
// Launch the task
task.launch()
Expand All @@ -255,5 +256,6 @@ class TestNSHTTPCookieStorage: XCTestCase {
XCTAssertEqual(status, 0)
let terminationReason = task.terminationReason
XCTAssertEqual(terminationReason, Process.TerminationReason.exit)
try? fm.removeItem(atPath: testPath)
}
}
Loading