瀏覽代碼

Clean up configration files

kishikawa katsumi 9 年之前
父節點
當前提交
2981f1001e

+ 1 - 1
Lib/Configurations/Base.xcconfig

@@ -29,7 +29,7 @@ VERSIONING_SYSTEM = "apple-generic";
 VERSION_INFO_PREFIX = "";
 
 CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer;
-CODE_SIGNING_REQUIRED[sdk=macosx] = NO;
+CODE_SIGNING_REQUIRED[sdk=macosx*] = NO;
 
 MACOSX_DEPLOYMENT_TARGET = 10.9;
 IPHONEOS_DEPLOYMENT_TARGET = 8.0;

+ 1 - 1
Lib/Configurations/KeychainAccess.xcconfig

@@ -17,7 +17,7 @@ ENABLE_BITCODE[sdk=iphone*] = YES;
 ENABLE_BITCODE[sdk=watch*] = YES;
 ENABLE_BITCODE[sdk=appletv*] = YES;
 
-LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks;
 LD_RUNPATH_SEARCH_PATHS[sdk=iphone*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
 LD_RUNPATH_SEARCH_PATHS[sdk=watch*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
 LD_RUNPATH_SEARCH_PATHS[sdk=appletv*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
+LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks;

+ 4 - 3
Lib/Configurations/TestHost.xcconfig

@@ -7,20 +7,21 @@ INFOPLIST_FILE = TestHost/Info.plist;
 PRODUCT_NAME = $(TARGET_NAME);
 CLANG_MODULES_AUTOLINK = NO;
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+EMBEDDED_CONTENT_CONTAINS_SWIFT = YES
 
 PRODUCT_BUNDLE_IDENTIFIER = com.kishikawakatsumi.TestHost;
 
-CODE_SIGNING_REQUIRED[sdk=macosx] = NO;
+CODE_SIGNING_REQUIRED[sdk=macosx*] = NO;
 CODE_SIGN_ENTITLEMENTS = TestHost/TestHost.entitlements;
-OTHER_CODE_SIGN_FLAGS[sdk=macosx*] = --deep;
 PROVISIONING_PROFILE[sdk=iphone*] = ;
 PROVISIONING_PROFILE[sdk=appletv*] = ;
+OTHER_CODE_SIGN_FLAGS[sdk=macosx*] = --deep;
 
 PRINCIPAL_CLASS[sdk=iphone*] = UIApplication;
 PRINCIPAL_CLASS[sdk=appletv*] = UIApplication;
 PRINCIPAL_CLASS[sdk=macosx*] = NSApplication;
 
-LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks;
 LD_RUNPATH_SEARCH_PATHS[sdk=iphone*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
 LD_RUNPATH_SEARCH_PATHS[sdk=watch*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
 LD_RUNPATH_SEARCH_PATHS[sdk=appletv*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
+LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks;

+ 3 - 3
Lib/Configurations/Tests.xcconfig

@@ -6,15 +6,15 @@ PRODUCT_NAME = $(TARGET_NAME);
 APPLICATION_EXTENSION_API_ONLY = NO;
 INFOPLIST_FILE = KeychainAccessTests/Info.plist;
 
-LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks;
 LD_RUNPATH_SEARCH_PATHS[sdk=iphone*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
 LD_RUNPATH_SEARCH_PATHS[sdk=watch*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
 LD_RUNPATH_SEARCH_PATHS[sdk=appletv*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
+LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks;
 
 TEST_HOST[sdk=iphone*] = $(BUILT_PRODUCTS_DIR)/TestHost.app/TestHost;
 TEST_HOST[sdk=appletv*] = $(BUILT_PRODUCTS_DIR)/TestHost.app/TestHost;
 TEST_HOST[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/TestHost.app/Contents/MacOS/TestHost;
 
-EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = SharedCredentialTests.swift;
 EXCLUDED_SOURCE_FILE_NAMES[sdk=watch*] = *;
-EXCLUDED_SOURCE_FILE_NAMES[sdk=appletv*] = SharedCredentialTests.swift;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=appletv*] = SharedCredentialTests.swift;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = SharedCredentialTests.swift;

+ 0 - 4
Lib/KeychainAccess.xcodeproj/project.pbxproj

@@ -429,8 +429,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 14F0C1981D329832007DCDDB /* TestHost.xcconfig */;
 			buildSettings = {
-				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 			};
 			name = Debug;
 		};
@@ -438,8 +436,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 14F0C1981D329832007DCDDB /* TestHost.xcconfig */;
 			buildSettings = {
-				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 			};
 			name = Release;
 		};