Skip to content

Commit 73b22b1

Browse files
spevansspevans
authored
Merge pull request #2681 from spevans/pr_xcode_fixes
GenerateTestFixtures: Fix building on Xcode
2 parents 7198faf + a5cc7d0 commit 73b22b1

File tree

2 files changed

+33
-15
lines changed

2 files changed

+33
-15
lines changed

‎Foundation.xcodeproj/project.pbxproj

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@
402402
B933A79E1F3055F700FE6846 /* NSString-UTF32-BE-data.txt in Resources */ = {isa = PBXBuildFile; fileRef = B933A79C1F3055F600FE6846 /* NSString-UTF32-BE-data.txt */; };
403403
B933A79F1F3055F700FE6846 /* NSString-UTF32-LE-data.txt in Resources */ = {isa = PBXBuildFile; fileRef = B933A79D1F3055F600FE6846 /* NSString-UTF32-LE-data.txt */; };
404404
B940492D223B146800FB4384 /* TestProgressFraction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B940492C223B146800FB4384 /* TestProgressFraction.swift */; };
405+
B94B063C23FDE2BD00B244E8 /* SwiftFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B5D885D1BBC938800234F36 /* SwiftFoundation.framework */; };
405406
B951B5EC1F4E2A2000D8B332 /* TestNSLock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B951B5EB1F4E2A2000D8B332 /* TestNSLock.swift */; };
406407
B95FC97622B84B0A005DEA0A /* TestNSSortDescriptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 152EF3932283457B001E1269 /* TestNSSortDescriptor.swift */; };
407408
B983E32C23F0C69600D9C402 /* Docs in Resources */ = {isa = PBXBuildFile; fileRef = B983E32B23F0C69600D9C402 /* Docs */; };
@@ -610,6 +611,13 @@
610611
remoteGlobalIDString = 5B5D885C1BBC938800234F36;
611612
remoteInfo = SwiftFoundation;
612613
};
614+
B94B063A23FDE0AA00B244E8 /* PBXContainerItemProxy */ = {
615+
isa = PBXContainerItemProxy;
616+
containerPortal = 5B5D88541BBC938800234F36 /* Project object */;
617+
proxyType = 1;
618+
remoteGlobalIDString = 5B5D885C1BBC938800234F36;
619+
remoteInfo = SwiftFoundation;
620+
};
613621
B98F173F229AF5AF00F2B002 /* PBXContainerItemProxy */ = {
614622
isa = PBXContainerItemProxy;
615623
containerPortal = 5B5D88541BBC938800234F36 /* Project object */;
@@ -1355,6 +1363,7 @@
13551363
isa = PBXFrameworksBuildPhase;
13561364
buildActionMask = 2147483647;
13571365
files = (
1366+
B94B063C23FDE2BD00B244E8 /* SwiftFoundation.framework in Frameworks */,
13581367
);
13591368
runOnlyForDeploymentPostprocessing = 0;
13601369
};
@@ -2593,6 +2602,7 @@
25932602
buildRules = (
25942603
);
25952604
dependencies = (
2605+
B94B063B23FDE0AA00B244E8 /* PBXTargetDependency */,
25962606
);
25972607
name = GenerateTestFixtures;
25982608
productName = GenerateTestFixtures;
@@ -3251,6 +3261,11 @@
32513261
target = 5B5D885C1BBC938800234F36 /* SwiftFoundation */;
32523262
targetProxy = B90FD23120C2FF840087EF44 /* PBXContainerItemProxy */;
32533263
};
3264+
B94B063B23FDE0AA00B244E8 /* PBXTargetDependency */ = {
3265+
isa = PBXTargetDependency;
3266+
target = 5B5D885C1BBC938800234F36 /* SwiftFoundation */;
3267+
targetProxy = B94B063A23FDE0AA00B244E8 /* PBXContainerItemProxy */;
3268+
};
32543269
B98F1740229AF5AF00F2B002 /* PBXTargetDependency */ = {
32553270
isa = PBXTargetDependency;
32563271
target = EA66F66E1BF56CCB00136161 /* plutil */;
@@ -3416,7 +3431,7 @@
34163431
"-Wno-int-conversion",
34173432
"-Wno-unused-function",
34183433
);
3419-
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -swift-version 4.2";
3434+
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT";
34203435
PRODUCT_BUNDLE_IDENTIFIER = org.swift.Foundation.XML;
34213436
PRODUCT_NAME = "$(TARGET_NAME)";
34223437
SKIP_INSTALL = YES;
@@ -3472,7 +3487,7 @@
34723487
"-Wno-int-conversion",
34733488
"-Wno-unused-function",
34743489
);
3475-
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -swift-version 4.2";
3490+
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT";
34763491
PRODUCT_BUNDLE_IDENTIFIER = org.swift.Foundation.XML;
34773492
PRODUCT_NAME = "$(TARGET_NAME)";
34783493
SKIP_INSTALL = YES;
@@ -3530,7 +3545,7 @@
35303545
"-Wno-unused-function",
35313546
);
35323547
OTHER_LDFLAGS = "-twolevel_namespace";
3533-
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -swift-version 4.2";
3548+
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT";
35343549
PRODUCT_BUNDLE_IDENTIFIER = org.swift.Foundation.Networking;
35353550
PRODUCT_NAME = "$(TARGET_NAME)";
35363551
SKIP_INSTALL = YES;
@@ -3590,7 +3605,7 @@
35903605
"-Wno-unused-function",
35913606
);
35923607
OTHER_LDFLAGS = "-twolevel_namespace";
3593-
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -swift-version 4.2";
3608+
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT";
35943609
PRODUCT_BUNDLE_IDENTIFIER = org.swift.Foundation.Networking;
35953610
PRODUCT_NAME = "$(TARGET_NAME)";
35963611
SKIP_INSTALL = YES;
@@ -3867,7 +3882,7 @@
38673882
r,
38683883
r,
38693884
);
3870-
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -swift-version 4.2";
3885+
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT";
38713886
PRODUCT_BUNDLE_IDENTIFIER = org.swift.Foundation;
38723887
PRODUCT_NAME = "$(TARGET_NAME)";
38733888
SKIP_INSTALL = YES;
@@ -3945,7 +3960,7 @@
39453960
r,
39463961
r,
39473962
);
3948-
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -swift-version 4.2";
3963+
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT";
39493964
PRODUCT_BUNDLE_IDENTIFIER = org.swift.Foundation;
39503965
PRODUCT_NAME = "$(TARGET_NAME)";
39513966
SKIP_INSTALL = YES;
@@ -4161,12 +4176,13 @@
41614176
buildSettings = {
41624177
CLANG_ENABLE_MODULES = YES;
41634178
CLANG_ENABLE_OBJC_ARC = YES;
4164-
HEADER_SEARCH_PATHS = "$(CONFIGURATION_BUILD_DIR)/usr/local/include";
4179+
HEADER_SEARCH_PATHS = "";
41654180
LD_RUNPATH_SEARCH_PATHS = (
41664181
"$(TOOLCHAIN_DIR)/usr/lib/swift/macosx",
41674182
"@executable_path",
41684183
"@executable_path/../Frameworks",
41694184
);
4185+
MACOSX_DEPLOYMENT_TARGET = 10.14;
41704186
PRODUCT_NAME = "$(TARGET_NAME)";
41714187
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
41724188
SWIFT_VERSION = 5.0;
@@ -4178,12 +4194,13 @@
41784194
buildSettings = {
41794195
CLANG_ENABLE_MODULES = YES;
41804196
CLANG_ENABLE_OBJC_ARC = YES;
4181-
HEADER_SEARCH_PATHS = "$(CONFIGURATION_BUILD_DIR)/usr/local/include";
4197+
HEADER_SEARCH_PATHS = "";
41824198
LD_RUNPATH_SEARCH_PATHS = (
41834199
"$(TOOLCHAIN_DIR)/usr/lib/swift/macosx",
41844200
"@executable_path",
41854201
"@executable_path/../Frameworks",
41864202
);
4203+
MACOSX_DEPLOYMENT_TARGET = 10.14;
41874204
PRODUCT_NAME = "$(TARGET_NAME)";
41884205
SWIFT_VERSION = 5.0;
41894206
};
@@ -4202,11 +4219,11 @@
42024219
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
42034220
CODE_SIGN_STYLE = Automatic;
42044221
GCC_C_LANGUAGE_STANDARD = gnu11;
4205-
MACOSX_DEPLOYMENT_TARGET = 10.15;
4206-
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
4207-
MTL_FAST_MATH = YES;
4222+
HEADER_SEARCH_PATHS = "";
4223+
MACOSX_DEPLOYMENT_TARGET = 10.14;
4224+
MTL_ENABLE_DEBUG_INFO = YES;
42084225
PRODUCT_NAME = "$(TARGET_NAME)";
4209-
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
4226+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG NS_GENERATE_FIXTURES_FROM_SWIFT_CORELIBS_FOUNDATION_ON_DARWIN";
42104227
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
42114228
SWIFT_VERSION = 5.0;
42124229
};
@@ -4225,9 +4242,10 @@
42254242
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
42264243
CODE_SIGN_STYLE = Automatic;
42274244
GCC_C_LANGUAGE_STANDARD = gnu11;
4228-
MACOSX_DEPLOYMENT_TARGET = 10.15;
4229-
MTL_FAST_MATH = YES;
4245+
HEADER_SEARCH_PATHS = "";
4246+
MACOSX_DEPLOYMENT_TARGET = 10.14;
42304247
PRODUCT_NAME = "$(TARGET_NAME)";
4248+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = NS_GENERATE_FIXTURES_FROM_SWIFT_CORELIBS_FOUNDATION_ON_DARWIN;
42314249
SWIFT_VERSION = 5.0;
42324250
};
42334251
name = Release;

‎Tests/Foundation/FixtureValues.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
// Please keep this import statement as-is; this file is also used by the GenerateTestFixtures project, which doesn't have TestImports.swift.
1010

11-
#if DEPLOYMENT_RUNTIME_SWIFT && (os(macOS) || os(iOS) || os(watchOS) || os(tvOS))
11+
#if canImport(SwiftFoundation)
1212
import SwiftFoundation
1313
#else
1414
import Foundation

0 commit comments

Comments
 (0)