Browse Source

Merge pull request #24 from norio-nomura/update-build-configurations

Update build configurations
Norio Nomura 8 years ago
parent
commit
83776abb90

+ 4 - 4
.travis.yml

@@ -3,10 +3,10 @@ matrix:
   include:
   include:
   - script:
   - script:
     - set -o pipefail
     - set -o pipefail
-    - xcodebuild -scheme Base32 -sdk macosx build-for-testing test | xcpretty
-    - xcodebuild -scheme Base32 -sdk iphonesimulator -destination "name=iPhone 7" build-for-testing test | xcpretty
-    - xcodebuild -scheme Base32 -sdk appletvsimulator -destination "name=Apple TV 1080p" build-for-testing test | xcpretty
-    - xcodebuild -scheme Base32 -sdk watchsimulator -destination "name=Apple Watch - 38mm" build | xcpretty
+    - xcodebuild -scheme Base32 test | xcpretty
+    - xcodebuild -scheme Base32 test -destination "name=iPhone 7" | xcpretty
+    - xcodebuild -scheme Base32 test -destination "name=Apple TV 1080p" | xcpretty
+    - xcodebuild -scheme Base32 build -destination "name=Apple Watch - 38mm" | xcpretty
     - swift test
     - swift test
     env: JOB=macOS
     env: JOB=macOS
     os: osx
     os: osx

+ 18 - 0
Base32.xcodeproj/Configs/Project.xcconfig

@@ -8,3 +8,21 @@ DYLIB_INSTALL_NAME_BASE = @rpath
 OTHER_SWIFT_FLAGS = -DXcode
 OTHER_SWIFT_FLAGS = -DXcode
 COMBINE_HIDPI_IMAGES = YES
 COMBINE_HIDPI_IMAGES = YES
 USE_HEADERMAP = NO
 USE_HEADERMAP = NO
+FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks";
+CLANG_WARN_BOOL_CONVERSION = YES;
+CLANG_WARN_CONSTANT_CONVERSION = YES;
+CLANG_WARN_EMPTY_BODY = YES;
+CLANG_WARN_ENUM_CONVERSION = YES;
+CLANG_WARN_INFINITE_RECURSION = YES;
+CLANG_WARN_INT_CONVERSION = YES;
+CLANG_WARN_SUSPICIOUS_MOVE = YES;
+CLANG_WARN_UNREACHABLE_CODE = YES;
+CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ENABLE_STRICT_OBJC_MSGSEND = YES;
+GCC_NO_COMMON_BLOCKS = YES;
+GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+GCC_WARN_ABOUT_RETURN_TYPE = YES;
+GCC_WARN_UNDECLARED_SELECTOR = YES;
+GCC_WARN_UNINITIALIZED_AUTOS = YES;
+GCC_WARN_UNUSED_FUNCTION = YES;
+GCC_WARN_UNUSED_VARIABLE = YES;

+ 7 - 13
Base32.xcodeproj/project.pbxproj

@@ -287,8 +287,6 @@
 		_ReleaseConf_Base32 /* Release */ = {
 		_ReleaseConf_Base32 /* Release */ = {
 			isa = XCBuildConfiguration;
 			isa = XCBuildConfiguration;
 			buildSettings = {
 			buildSettings = {
-				ENABLE_TESTABILITY = YES;
-				FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks";
 				INFOPLIST_FILE = Base32.xcodeproj/Base32_Info.plist;
 				INFOPLIST_FILE = Base32.xcodeproj/Base32_Info.plist;
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "$(inherited)";
@@ -303,9 +301,8 @@
 			isa = XCBuildConfiguration;
 			isa = XCBuildConfiguration;
 			buildSettings = {
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks";
 				INFOPLIST_FILE = Base32.xcodeproj/Base32Tests_Info.plist;
 				INFOPLIST_FILE = Base32.xcodeproj/Base32Tests_Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @loader_path/Frameworks";
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				SWIFT_VERSION = 3.0;
 				SWIFT_VERSION = 3.0;
@@ -316,9 +313,8 @@
 			isa = XCBuildConfiguration;
 			isa = XCBuildConfiguration;
 			buildSettings = {
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks";
 				INFOPLIST_FILE = Base32.xcodeproj/SecEncodeTransformTests_Info.plist;
 				INFOPLIST_FILE = Base32.xcodeproj/SecEncodeTransformTests_Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @loader_path/Frameworks";
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				SWIFT_VERSION = 3.0;
 				SWIFT_VERSION = 3.0;
@@ -328,15 +324,12 @@
 		"___DebugConf_Base32" /* Debug */ = {
 		"___DebugConf_Base32" /* Debug */ = {
 			isa = XCBuildConfiguration;
 			isa = XCBuildConfiguration;
 			buildSettings = {
 			buildSettings = {
-				ENABLE_TESTABILITY = YES;
-				FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks";
 				INFOPLIST_FILE = Base32.xcodeproj/Base32_Info.plist;
 				INFOPLIST_FILE = Base32.xcodeproj/Base32_Info.plist;
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = Base32;
 				PRODUCT_BUNDLE_IDENTIFIER = Base32;
 				PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 3.0;
 				SWIFT_VERSION = 3.0;
 			};
 			};
 			name = Debug;
 			name = Debug;
@@ -345,12 +338,10 @@
 			isa = XCBuildConfiguration;
 			isa = XCBuildConfiguration;
 			buildSettings = {
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks";
 				INFOPLIST_FILE = Base32.xcodeproj/Base32Tests_Info.plist;
 				INFOPLIST_FILE = Base32.xcodeproj/Base32Tests_Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @loader_path/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @loader_path/Frameworks";
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "$(inherited)";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 3.0;
 				SWIFT_VERSION = 3.0;
 			};
 			};
 			name = Debug;
 			name = Debug;
@@ -359,12 +350,10 @@
 			isa = XCBuildConfiguration;
 			isa = XCBuildConfiguration;
 			buildSettings = {
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks";
 				INFOPLIST_FILE = Base32.xcodeproj/SecEncodeTransformTests_Info.plist;
 				INFOPLIST_FILE = Base32.xcodeproj/SecEncodeTransformTests_Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @loader_path/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @loader_path/Frameworks";
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "$(inherited)";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 3.0;
 				SWIFT_VERSION = 3.0;
 			};
 			};
 			name = Debug;
 			name = Debug;
@@ -373,6 +362,8 @@
 			isa = XCBuildConfiguration;
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = __PBXFileRef_Base32.xcodeproj/Configs/Project.xcconfig /* Base32.xcodeproj/Configs/Project.xcconfig */;
 			baseConfigurationReference = __PBXFileRef_Base32.xcodeproj/Configs/Project.xcconfig /* Base32.xcodeproj/Configs/Project.xcconfig */;
 			buildSettings = {
 			buildSettings = {
+				ENABLE_TESTABILITY = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 			};
 			};
 			name = Release;
 			name = Release;
 		};
 		};
@@ -380,6 +371,9 @@
 			isa = XCBuildConfiguration;
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = __PBXFileRef_Base32.xcodeproj/Configs/Project.xcconfig /* Base32.xcodeproj/Configs/Project.xcconfig */;
 			baseConfigurationReference = __PBXFileRef_Base32.xcodeproj/Configs/Project.xcconfig /* Base32.xcodeproj/Configs/Project.xcconfig */;
 			buildSettings = {
 			buildSettings = {
+				ENABLE_TESTABILITY = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
 			};
 			name = Debug;
 			name = Debug;
 		};
 		};

+ 1 - 1
Base32.xcodeproj/xcshareddata/xcschemes/Base32.xcscheme

@@ -23,7 +23,7 @@
       </BuildActionEntries>
       </BuildActionEntries>
    </BuildAction>
    </BuildAction>
    <TestAction
    <TestAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       shouldUseLaunchSchemeArgsEnv = "YES">