From 56740c3ea69eccdd8ce33eedbadbe2b1686a896b Mon Sep 17 00:00:00 2001 From: Yonas Kolb Date: Sun, 27 Aug 2017 17:54:23 +0200 Subject: [PATCH] tweak build settings format --- .../project.pbxproj | 35 ++++++++--- SettingPresets/Configs/debug.yml | 20 ++++--- SettingPresets/Configs/release.yml | 13 +++-- SettingPresets/Platforms/iOS.yml | 2 +- SettingPresets/Platforms/tvOS.yml | 7 ++- SettingPresets/Products/bundle.ui-testing.yml | 2 +- SettingPresets/Products/bundle.unit-test.yml | 2 +- SettingPresets/Products/tv-app-extension.yml | 2 +- .../Products/watchkit2-extension.yml | 2 +- SettingPresets/base.yml | 58 ++++++++++--------- 10 files changed, 86 insertions(+), 57 deletions(-) diff --git a/Fixtures/TestProject/GeneratedProject.xcodeproj/project.pbxproj b/Fixtures/TestProject/GeneratedProject.xcodeproj/project.pbxproj index 8f787526..35695178 100644 --- a/Fixtures/TestProject/GeneratedProject.xcodeproj/project.pbxproj +++ b/Fixtures/TestProject/GeneratedProject.xcodeproj/project.pbxproj @@ -378,7 +378,10 @@ INFOPLIST_FILE = MyFramework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; @@ -391,7 +394,10 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = TestProject/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.test; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -404,6 +410,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -429,8 +436,8 @@ GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", "$(inherited)", + "DEBUG=1", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; @@ -454,7 +461,10 @@ BUNDLE_LOADER = "$(TEST_HOST)"; INFOPLIST_FILE = TestProjectTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks @loader_path/Frameworks", + ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestProject.app/TestProject"; @@ -467,7 +477,10 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = TestProject/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.test; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -480,6 +493,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -502,7 +516,6 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = s; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -523,7 +536,10 @@ BUNDLE_LOADER = "$(TEST_HOST)"; INFOPLIST_FILE = TestProjectTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks @loader_path/Frameworks", + ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestProject.app/TestProject"; @@ -540,7 +556,10 @@ INFOPLIST_FILE = MyFramework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; diff --git a/SettingPresets/Configs/debug.yml b/SettingPresets/Configs/debug.yml index c6caef31..5b0b7521 100644 --- a/SettingPresets/Configs/debug.yml +++ b/SettingPresets/Configs/debug.yml @@ -1,12 +1,14 @@ +--- +# Settings take from the following file and sorted +# /Applications/Xcode.app/Contents/Developer/Library/Xcode/Templates/Project Templates/Base/Base_ProjectSettings.xctemplate/TemplateInfo.plist DEBUG_INFORMATION_FORMAT: dwarf -SWIFT_OPTIMIZATION_LEVEL: "-Onone" -ENABLE_TESTABILITY: 'YES' -GCC_DYNAMIC_NO_PIC: 'NO' +ENABLE_TESTABILITY: YES +GCC_DYNAMIC_NO_PIC: NO GCC_OPTIMIZATION_LEVEL: '0' -ONLY_ACTIVE_ARCH: 'YES' +GCC_PREPROCESSOR_DEFINITIONS: ["$(inherited)", "DEBUG=1"] +MTL_ENABLE_DEBUG_INFO: YES +ONLY_ACTIVE_ARCH: YES + +# Swift Settings SWIFT_ACTIVE_COMPILATION_CONDITIONS: DEBUG -CLANG_WARN_SUSPICIOUS_MOVE: 'YES' -MTL_ENABLE_DEBUG_INFO: 'YES' -GCC_PREPROCESSOR_DEFINITIONS: -- DEBUG=1 -- "$(inherited)" +SWIFT_OPTIMIZATION_LEVEL: -Onone diff --git a/SettingPresets/Configs/release.yml b/SettingPresets/Configs/release.yml index 7ccb2da6..b32b0c58 100644 --- a/SettingPresets/Configs/release.yml +++ b/SettingPresets/Configs/release.yml @@ -1,6 +1,9 @@ +--- +# Settings take from the following file and sorted +# /Applications/Xcode.app/Contents/Developer/Library/Xcode/Templates/Project Templates/Base/Base_ProjectSettings.xctemplate/TemplateInfo.plist DEBUG_INFORMATION_FORMAT: dwarf-with-dsym -SWIFT_OPTIMIZATION_LEVEL: "-Owholemodule" -ENABLE_NS_ASSERTIONS: 'NO' -GCC_OPTIMIZATION_LEVEL: s -VALIDATE_PRODUCT: 'YES' -CLANG_WARN_SUSPICIOUS_MOVE: 'YES' +ENABLE_NS_ASSERTIONS: NO +VALIDATE_PRODUCT: YES + +# Swift Settings +SWIFT_OPTIMIZATION_LEVEL: -Owholemodule diff --git a/SettingPresets/Platforms/iOS.yml b/SettingPresets/Platforms/iOS.yml index a1e879c9..623f44ca 100644 --- a/SettingPresets/Platforms/iOS.yml +++ b/SettingPresets/Platforms/iOS.yml @@ -1,4 +1,4 @@ -LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks" +LD_RUNPATH_SEARCH_PATHS: ["$(inherited)", "@executable_path/Frameworks"] SDKROOT: iphoneos IPHONEOS_DEPLOYMENT_TARGET: 10.0 TARGETED_DEVICE_FAMILY: '1,2' diff --git a/SettingPresets/Platforms/tvOS.yml b/SettingPresets/Platforms/tvOS.yml index c59a1a44..1f007868 100644 --- a/SettingPresets/Platforms/tvOS.yml +++ b/SettingPresets/Platforms/tvOS.yml @@ -1,5 +1,6 @@ TARGETED_DEVICE_FAMILY: 3 -SDKROOT: 'appletvos' -TVOS_DEPLOYMENT_TARGET: 10.0 -LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks" +LD_RUNPATH_SEARCH_PATHS: ["$(inherited)", "@executable_path/Frameworks"] +SDKROOT: appletvos +TVOS_DEPLOYMENT_TARGET: "10.0" ASSETCATALOG_COMPILER_APPICON_NAME: App Icon & Top Shelf Image +ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME: tvOS LaunchImage diff --git a/SettingPresets/Products/bundle.ui-testing.yml b/SettingPresets/Products/bundle.ui-testing.yml index 06f7d212..d544579e 100644 --- a/SettingPresets/Products/bundle.ui-testing.yml +++ b/SettingPresets/Products/bundle.ui-testing.yml @@ -1,2 +1,2 @@ BUNDLE_LOADER: $(TEST_HOST) -LD_RUNPATH_SEARCH_PATHS: $(inherited) @executable_path/Frameworks @loader_path/Frameworks +LD_RUNPATH_SEARCH_PATHS: ["$(inherited)", "@executable_path/Frameworks @loader_path/Frameworks"] diff --git a/SettingPresets/Products/bundle.unit-test.yml b/SettingPresets/Products/bundle.unit-test.yml index 06f7d212..d544579e 100644 --- a/SettingPresets/Products/bundle.unit-test.yml +++ b/SettingPresets/Products/bundle.unit-test.yml @@ -1,2 +1,2 @@ BUNDLE_LOADER: $(TEST_HOST) -LD_RUNPATH_SEARCH_PATHS: $(inherited) @executable_path/Frameworks @loader_path/Frameworks +LD_RUNPATH_SEARCH_PATHS: ["$(inherited)", "@executable_path/Frameworks @loader_path/Frameworks"] diff --git a/SettingPresets/Products/tv-app-extension.yml b/SettingPresets/Products/tv-app-extension.yml index 72261c41..b27996cb 100644 --- a/SettingPresets/Products/tv-app-extension.yml +++ b/SettingPresets/Products/tv-app-extension.yml @@ -1,2 +1,2 @@ SKIP_INSTALL: 'YES' -LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks" +LD_RUNPATH_SEARCH_PATHS: ["$(inherited)", "@executable_path/Frameworks", "@executable_path/../../Frameworks"] diff --git a/SettingPresets/Products/watchkit2-extension.yml b/SettingPresets/Products/watchkit2-extension.yml index cb41cd36..f77f27a5 100644 --- a/SettingPresets/Products/watchkit2-extension.yml +++ b/SettingPresets/Products/watchkit2-extension.yml @@ -1,2 +1,2 @@ -LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks" +LD_RUNPATH_SEARCH_PATHS: ["$(inherited)", "@executable_path/Frameworks", "@executable_path/../../Frameworks"] ASSETCATALOG_COMPILER_COMPLICATION_NAME: Complication diff --git a/SettingPresets/base.yml b/SettingPresets/base.yml index e1e28572..6ad9d9be 100644 --- a/SettingPresets/base.yml +++ b/SettingPresets/base.yml @@ -1,33 +1,37 @@ --- -PRODUCT_NAME: '$(TARGET_NAME)' -SWIFT_VERSION: '3.0' -COPY_PHASE_STRIP: 'NO' -ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: 'YES' -ALWAYS_SEARCH_USER_PATHS: 'NO' -CLANG_ANALYZER_NONNULL: 'YES' +# Settings take from the following file and sorted +# /Applications/Xcode.app/Contents/Developer/Library/Xcode/Templates/Project Templates/Base/Base_ProjectSettings.xctemplate/TemplateInfo.plist +ALWAYS_SEARCH_USER_PATHS: NO +CLANG_ANALYZER_NONNULL: YES +CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION: YES_AGGRESSIVE CLANG_CXX_LANGUAGE_STANDARD: gnu++0x CLANG_CXX_LIBRARY: libc++ -CLANG_ENABLE_MODULES: 'YES' -CLANG_ENABLE_OBJC_ARC: 'YES' -CLANG_WARN_BOOL_CONVERSION: 'YES' -CLANG_WARN_CONSTANT_CONVERSION: 'YES' +CLANG_ENABLE_MODULES: YES +CLANG_ENABLE_OBJC_ARC: YES +CLANG_WARN_BOOL_CONVERSION: YES +CLANG_WARN_CONSTANT_CONVERSION: YES CLANG_WARN_DIRECT_OBJC_ISA_USAGE: YES_ERROR -CLANG_WARN_DOCUMENTATION_COMMENTS: 'YES' -CLANG_WARN_EMPTY_BODY: 'YES' -CLANG_WARN_ENUM_CONVERSION: 'YES' -CLANG_WARN_INFINITE_RECURSION: 'YES' -CLANG_WARN_INT_CONVERSION: 'YES' +CLANG_WARN_DOCUMENTATION_COMMENTS: YES +CLANG_WARN_EMPTY_BODY: YES +CLANG_WARN_ENUM_CONVERSION: YES +CLANG_WARN_INFINITE_RECURSION: YES +CLANG_WARN_INT_CONVERSION: YES CLANG_WARN_OBJC_ROOT_CLASS: YES_ERROR -CLANG_WARN_SUSPICIOUS_MOVE: 'YES' -CLANG_WARN_UNREACHABLE_CODE: 'YES' -CLANG_WARN__DUPLICATE_METHOD_MATCH: 'YES' -GCC_WARN_64_TO_32_BIT_CONVERSION: 'YES' -GCC_WARN_ABOUT_RETURN_TYPE: YES_ERROR -GCC_WARN_UNDECLARED_SELECTOR: 'YES' -GCC_WARN_UNINITIALIZED_AUTOS: YES_AGGRESSIVE -GCC_WARN_UNUSED_FUNCTION: 'YES' -GCC_WARN_UNUSED_VARIABLE: 'YES' -COPY_PHASE_STRIP: 'NO' +CLANG_WARN_SUSPICIOUS_MOVE: YES +CLANG_WARN_UNREACHABLE_CODE: YES +CLANG_WARN__DUPLICATE_METHOD_MATCH: YES +COPY_PHASE_STRIP: NO +ENABLE_STRICT_OBJC_MSGSEND: YES GCC_C_LANGUAGE_STANDARD: gnu99 -GCC_NO_COMMON_BLOCKS: '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_ERROR +GCC_WARN_UNDECLARED_SELECTOR: YES +GCC_WARN_UNINITIALIZED_AUTOS: YES_AGGRESSIVE +GCC_WARN_UNUSED_FUNCTION: YES +GCC_WARN_UNUSED_VARIABLE: YES + +# Swift Settings +PRODUCT_NAME: $(TARGET_NAME) +SWIFT_VERSION: '3.0' +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: YES