From 022bd7a9782e6252a8d24c95e642166d8838df72 Mon Sep 17 00:00:00 2001 From: Aron Cedercrantz Date: Mon, 8 Feb 2016 13:50:24 +0100 Subject: [PATCH 1/7] Normalize formatting in xcconfig --- spotify_os.xcconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spotify_os.xcconfig b/spotify_os.xcconfig index 5d9ed853..1fe611e9 100644 --- a/spotify_os.xcconfig +++ b/spotify_os.xcconfig @@ -13,9 +13,9 @@ ONLY_ACTIVE_ARCH_Release = NO ONLY_ACTIVE_ARCH = $(ONLY_ACTIVE_ARCH_$(CONFIGURATION)) SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator watchsimulator appletvsimulator CLANG_MODULES_AUTOLINK = NO -INSTALL_PATH=@rpath -DYLIB_INSTALL_NAME_BASE=@rpath -LD_RUNPATH_SEARCH_PATHS=$(inherited) @executable_path/Frameworks @loader_path/Frameworks +INSTALL_PATH = @rpath +DYLIB_INSTALL_NAME_BASE = @rpath +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks // Language standards GCC_C_LANGUAGE_STANDARD = gnu99 From 177f472a8726fd02002c83c8b4cbfaf496f871df Mon Sep 17 00:00:00 2001 From: Aron Cedercrantz Date: Mon, 8 Feb 2016 14:13:06 +0100 Subject: [PATCH 2/7] Fix ENABLE_NS_ASSERTIONS not being set --- spotify_os.xcconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/spotify_os.xcconfig b/spotify_os.xcconfig index 1fe611e9..d7d34853 100644 --- a/spotify_os.xcconfig +++ b/spotify_os.xcconfig @@ -8,6 +8,7 @@ TVOS_DEPLOYMENT_TARGET = 9.0 MACOSX_DEPLOYMENT_TARGET = 10.8 ENABLE_NS_ASSERTIONS_Debug = YES ENABLE_NS_ASSERTIONS_Release = NO +ENABLE_NS_ASSERTIONS = $(ENABLE_NS_ASSERTIONS_$(CONFIGURATION)) ONLY_ACTIVE_ARCH_Debug = YES ONLY_ACTIVE_ARCH_Release = NO ONLY_ACTIVE_ARCH = $(ONLY_ACTIVE_ARCH_$(CONFIGURATION)) From 45c60d58be0ebc0ac7d928461e96894b82dbd021 Mon Sep 17 00:00:00 2001 From: Aron Cedercrantz Date: Mon, 8 Feb 2016 14:13:23 +0100 Subject: [PATCH 3/7] Set CLANG_ENABLE_MODULES in xcconfig --- spotify_os.xcconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/spotify_os.xcconfig b/spotify_os.xcconfig index d7d34853..ae45aea1 100644 --- a/spotify_os.xcconfig +++ b/spotify_os.xcconfig @@ -13,6 +13,7 @@ ONLY_ACTIVE_ARCH_Debug = YES ONLY_ACTIVE_ARCH_Release = NO ONLY_ACTIVE_ARCH = $(ONLY_ACTIVE_ARCH_$(CONFIGURATION)) SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator watchsimulator appletvsimulator +CLANG_ENABLE_MODULES = YES CLANG_MODULES_AUTOLINK = NO INSTALL_PATH = @rpath DYLIB_INSTALL_NAME_BASE = @rpath From 6857c8293651a57732bc57e2c4b84673fc7af5a7 Mon Sep 17 00:00:00 2001 From: Aron Cedercrantz Date: Mon, 8 Feb 2016 14:13:36 +0100 Subject: [PATCH 4/7] Group settings in xcconfig --- spotify_os.xcconfig | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/spotify_os.xcconfig b/spotify_os.xcconfig index ae45aea1..694870ba 100644 --- a/spotify_os.xcconfig +++ b/spotify_os.xcconfig @@ -6,20 +6,25 @@ IPHONEOS_DEPLOYMENT_TARGET = 7.0 WATCHOS_DEPLOYMENT_TARGET = 2.0 TVOS_DEPLOYMENT_TARGET = 9.0 MACOSX_DEPLOYMENT_TARGET = 10.8 + ENABLE_NS_ASSERTIONS_Debug = YES ENABLE_NS_ASSERTIONS_Release = NO ENABLE_NS_ASSERTIONS = $(ENABLE_NS_ASSERTIONS_$(CONFIGURATION)) + ONLY_ACTIVE_ARCH_Debug = YES ONLY_ACTIVE_ARCH_Release = NO ONLY_ACTIVE_ARCH = $(ONLY_ACTIVE_ARCH_$(CONFIGURATION)) + SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator watchsimulator appletvsimulator + CLANG_ENABLE_MODULES = YES CLANG_MODULES_AUTOLINK = NO + INSTALL_PATH = @rpath DYLIB_INSTALL_NAME_BASE = @rpath LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks -// Language standards +// Spotify language and std-library standards GCC_C_LANGUAGE_STANDARD = gnu99 CLANG_CXX_LANGUAGE_STANDARD = c++11 CLANG_CXX_LIBRARY = libc++ From c340c6c709d4e025b9aea4067259acc38e898ee2 Mon Sep 17 00:00:00 2001 From: Aron Cedercrantz Date: Mon, 8 Feb 2016 14:17:39 +0100 Subject: [PATCH 5/7] Set CLANG_ENABLE_OBJC_ARC to YES in xcconfig --- spotify_os.xcconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/spotify_os.xcconfig b/spotify_os.xcconfig index 694870ba..f4fcfffd 100644 --- a/spotify_os.xcconfig +++ b/spotify_os.xcconfig @@ -19,6 +19,7 @@ SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator watchsimulator appletvsimu CLANG_ENABLE_MODULES = YES CLANG_MODULES_AUTOLINK = NO +CLANG_ENABLE_OBJC_ARC = YES INSTALL_PATH = @rpath DYLIB_INSTALL_NAME_BASE = @rpath From 530e2885d6f9149a4e7d17b632ef198b0e9a64b0 Mon Sep 17 00:00:00 2001 From: Aron Cedercrantz Date: Mon, 8 Feb 2016 15:06:18 +0100 Subject: [PATCH 6/7] Move almost all shared settings to xcconfig --- SPTDataLoader.xcodeproj/project.pbxproj | 84 ---------------- SPTDataLoaderDemo.xcodeproj/project.pbxproj | 66 ------------- .../project.pbxproj | 96 +------------------ spotify_os.xcconfig | 21 ++++ 4 files changed, 23 insertions(+), 244 deletions(-) diff --git a/SPTDataLoader.xcodeproj/project.pbxproj b/SPTDataLoader.xcodeproj/project.pbxproj index 9d444839..e0137462 100644 --- a/SPTDataLoader.xcodeproj/project.pbxproj +++ b/SPTDataLoader.xcodeproj/project.pbxproj @@ -464,46 +464,15 @@ isa = XCBuildConfiguration; baseConfigurationReference = 050C30F71C56E5830044DFBE /* project.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_CODE_COVERAGE = 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_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - 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; HEADER_SEARCH_PATHS = ( "$(inherited)", - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, include, ); - IPHONEOS_DEPLOYMENT_TARGET = 7.0; - MACOSX_DEPLOYMENT_TARGET = 10.8; MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = "$(inherited)"; OTHER_LDFLAGS = "-ObjC"; - SUPPORTED_PLATFORMS = "$(inherited)"; - VALID_ARCHS = "$(inherited)"; }; name = Debug; }; @@ -511,43 +480,14 @@ isa = XCBuildConfiguration; baseConfigurationReference = 050C30F71C56E5830044DFBE /* project.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_CODE_COVERAGE = 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_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = YES; - ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - 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; HEADER_SEARCH_PATHS = ( "$(inherited)", - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, include, ); - IPHONEOS_DEPLOYMENT_TARGET = 7.0; - MACOSX_DEPLOYMENT_TARGET = 10.8; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = "-ObjC"; - SUPPORTED_PLATFORMS = "$(inherited)"; VALIDATE_PRODUCT = YES; - VALID_ARCHS = "$(inherited)"; }; name = Release; }; @@ -556,12 +496,9 @@ buildSettings = { COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; - ONLY_ACTIVE_ARCH = "$(inherited)"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "$(inherited)"; - VALID_ARCHS = "$(inherited)"; }; name = Debug; }; @@ -570,12 +507,9 @@ buildSettings = { COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; - ONLY_ACTIVE_ARCH = "$(inherited)"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "$(inherited)"; - VALID_ARCHS = "$(inherited)"; }; name = Release; }; @@ -587,18 +521,7 @@ "$(PLATFORM_DIR)/Developer/Library/Frameworks", "$(inherited)", ); - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - HEADER_SEARCH_PATHS = ( - "$(inherited)", - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - include, - SPTDataLoader, - ); INFOPLIST_FILE = SPTDataLoaderTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -612,14 +535,7 @@ "$(PLATFORM_DIR)/Developer/Library/Frameworks", "$(inherited)", ); - HEADER_SEARCH_PATHS = ( - "$(inherited)", - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - include, - SPTDataLoader, - ); INFOPLIST_FILE = SPTDataLoaderTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; diff --git a/SPTDataLoaderDemo.xcodeproj/project.pbxproj b/SPTDataLoaderDemo.xcodeproj/project.pbxproj index 898ffe78..b4fc641d 100644 --- a/SPTDataLoaderDemo.xcodeproj/project.pbxproj +++ b/SPTDataLoaderDemo.xcodeproj/project.pbxproj @@ -309,46 +309,16 @@ isa = XCBuildConfiguration; baseConfigurationReference = 050C30F71C56E5830044DFBE /* project.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_CODE_COVERAGE = 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_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - 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; HEADER_SEARCH_PATHS = ( "$(inherited)", - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, include, ); - IPHONEOS_DEPLOYMENT_TARGET = 7.0; - MACOSX_DEPLOYMENT_TARGET = 10.8; MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = "$(inherited)"; OTHER_LDFLAGS = "-ObjC"; - SUPPORTED_PLATFORMS = "$(inherited)"; - VALID_ARCHS = "$(inherited)"; }; name = Debug; }; @@ -356,43 +326,15 @@ isa = XCBuildConfiguration; baseConfigurationReference = 050C30F71C56E5830044DFBE /* project.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_CODE_COVERAGE = 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_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = YES; - ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - 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; HEADER_SEARCH_PATHS = ( "$(inherited)", - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, include, ); - IPHONEOS_DEPLOYMENT_TARGET = 7.0; - MACOSX_DEPLOYMENT_TARGET = 10.8; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = "-ObjC"; - SUPPORTED_PLATFORMS = "$(inherited)"; VALIDATE_PRODUCT = YES; - VALID_ARCHS = "$(inherited)"; }; name = Release; }; @@ -401,15 +343,11 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", ); INFOPLIST_FILE = demo/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.spotify.SPTDataLoaderDemo; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; @@ -424,11 +362,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = demo/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.spotify.SPTDataLoaderDemo; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; diff --git a/SPTDataLoaderFramework.xcodeproj/project.pbxproj b/SPTDataLoaderFramework.xcodeproj/project.pbxproj index 319bff67..cc8222dd 100644 --- a/SPTDataLoaderFramework.xcodeproj/project.pbxproj +++ b/SPTDataLoaderFramework.xcodeproj/project.pbxproj @@ -611,46 +611,16 @@ isa = XCBuildConfiguration; baseConfigurationReference = 050C30F71C56E5830044DFBE /* project.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_CODE_COVERAGE = YES; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = "$(inherited)"; - CLANG_WARN_CONSTANT_CONVERSION = "$(inherited)"; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = "$(inherited)"; - CLANG_WARN_ENUM_CONVERSION = "$(inherited)"; - CLANG_WARN_INT_CONVERSION = "$(inherited)"; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = "$(inherited)"; - COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = "$(inherited)"; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = "$(inherited)"; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = "$(inherited)"; - GCC_WARN_UNUSED_VARIABLE = "$(inherited)"; HEADER_SEARCH_PATHS = ( "$(inherited)", - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, include, ); - IPHONEOS_DEPLOYMENT_TARGET = 7.0; - MACOSX_DEPLOYMENT_TARGET = 10.8; MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = "$(inherited)"; OTHER_LDFLAGS = "-ObjC"; - SUPPORTED_PLATFORMS = "$(inherited)"; - VALID_ARCHS = "$(inherited)"; }; name = Debug; }; @@ -658,43 +628,15 @@ isa = XCBuildConfiguration; baseConfigurationReference = 050C30F71C56E5830044DFBE /* project.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_CODE_COVERAGE = YES; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = "$(inherited)"; - CLANG_WARN_CONSTANT_CONVERSION = "$(inherited)"; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = "$(inherited)"; - CLANG_WARN_ENUM_CONVERSION = "$(inherited)"; - CLANG_WARN_INT_CONVERSION = "$(inherited)"; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = "$(inherited)"; - COPY_PHASE_STRIP = YES; - ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_WARN_64_TO_32_BIT_CONVERSION = "$(inherited)"; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = "$(inherited)"; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = "$(inherited)"; - GCC_WARN_UNUSED_VARIABLE = "$(inherited)"; HEADER_SEARCH_PATHS = ( "$(inherited)", - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, include, ); - IPHONEOS_DEPLOYMENT_TARGET = 7.0; - MACOSX_DEPLOYMENT_TARGET = 10.8; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = "-ObjC"; - SUPPORTED_PLATFORMS = "$(inherited)"; VALIDATE_PRODUCT = YES; - VALID_ARCHS = "$(inherited)"; }; name = Release; }; @@ -702,22 +644,17 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; - CLANG_MODULES_AUTOLINK = "$(inherited)"; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = ""; - GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "SPT_BUILDING_FRAMEWORK=1", - "DEBUG=1", ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = ""; - LD_RUNPATH_SEARCH_PATHS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoader-Watch"; PRODUCT_NAME = SPTDataLoader; SDKROOT = watchos; @@ -726,7 +663,6 @@ TARGETED_DEVICE_FAMILY = 4; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; }; name = Debug; }; @@ -734,22 +670,18 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; - CLANG_MODULES_AUTOLINK = "$(inherited)"; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = ""; - GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "SPT_BUILDING_FRAMEWORK=1", ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = ""; - LD_RUNPATH_SEARCH_PATHS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoader-Watch"; PRODUCT_NAME = SPTDataLoader; SDKROOT = watchos; @@ -758,7 +690,6 @@ TARGETED_DEVICE_FAMILY = 4; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; }; name = Release; }; @@ -766,22 +697,17 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; - CLANG_MODULES_AUTOLINK = "$(inherited)"; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = ""; - GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( - "SPT_BUILDING_FRAMEWORK=1", "$(inherited)", - "DEBUG=1", + "SPT_BUILDING_FRAMEWORK=1", ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = ""; - LD_RUNPATH_SEARCH_PATHS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoader-TV"; PRODUCT_NAME = SPTDataLoader; SDKROOT = appletvos; @@ -798,22 +724,18 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; - CLANG_MODULES_AUTOLINK = "$(inherited)"; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = ""; - GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "SPT_BUILDING_FRAMEWORK=1", "$(inherited)", ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = ""; - LD_RUNPATH_SEARCH_PATHS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoader-TV"; PRODUCT_NAME = SPTDataLoader; SDKROOT = appletvos; @@ -831,10 +753,8 @@ buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; CLANG_MODULES_AUTOLINK = "$(inherited)"; - CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -844,11 +764,9 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "SPT_BUILDING_FRAMEWORK=1", - "DEBUG=1", ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = ""; - LD_RUNPATH_SEARCH_PATHS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoader-OSX"; PRODUCT_NAME = SPTDataLoader; SDKROOT = macosx; @@ -864,11 +782,9 @@ buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; CLANG_MODULES_AUTOLINK = "$(inherited)"; - CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -881,7 +797,6 @@ ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = ""; - LD_RUNPATH_SEARCH_PATHS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoader-OSX"; PRODUCT_NAME = SPTDataLoader; SDKROOT = macosx; @@ -896,19 +811,15 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; - CLANG_MODULES_AUTOLINK = "$(inherited)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = ""; - GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( - "SPT_BUILDING_FRAMEWORK=1", "$(inherited)", - "DEBUG=1", + "SPT_BUILDING_FRAMEWORK=1", ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = ""; @@ -929,16 +840,13 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; - CLANG_MODULES_AUTOLINK = "$(inherited)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = ""; - GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "SPT_BUILDING_FRAMEWORK=1", "$(inherited)", diff --git a/spotify_os.xcconfig b/spotify_os.xcconfig index f4fcfffd..268f921c 100644 --- a/spotify_os.xcconfig +++ b/spotify_os.xcconfig @@ -14,22 +14,43 @@ ENABLE_NS_ASSERTIONS = $(ENABLE_NS_ASSERTIONS_$(CONFIGURATION)) ONLY_ACTIVE_ARCH_Debug = YES ONLY_ACTIVE_ARCH_Release = NO ONLY_ACTIVE_ARCH = $(ONLY_ACTIVE_ARCH_$(CONFIGURATION)) +DEBUG_INFORMATION_FORMAT_Debug = dwarf +DEBUG_INFORMATION_FORMAT_Release = dwarf-with-dsym +DEBUG_INFORMATION_FORMAT = $(DEBUG_INFORMATION_FORMAT_$(CONFIGURATION)) +ENABLE_TESTABILITY_Debug = YES +ENABLE_TESTABILITY_Release = NO +ENABLE_TESTABILITY = $(ENABLE_TESTABILITY_$(CONFIGURATION)) SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator watchsimulator appletvsimulator CLANG_ENABLE_MODULES = YES CLANG_MODULES_AUTOLINK = NO CLANG_ENABLE_OBJC_ARC = YES +GCC_NO_COMMON_BLOCKS = YES +GCC_OPTIMIZATION_LEVEL_Debug = 0 +GCC_OPTIMIZATION_LEVEL_Release = s +GCC_OPTIMIZATION_LEVEL = $(GCC_OPTIMIZATION_LEVEL_$(CONFIGURATION)) + +ALWAYS_SEARCH_USER_PATHS = NO INSTALL_PATH = @rpath DYLIB_INSTALL_NAME_BASE = @rpath LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks +COPY_PHASE_STRIP_Debug = NO +COPY_PHASE_STRIP_Release = YES +COPY_PHASE_STRIP = $(COPY_PHASE_STRIP_$(CONFIGURATION)) // Spotify language and std-library standards GCC_C_LANGUAGE_STANDARD = gnu99 CLANG_CXX_LANGUAGE_STANDARD = c++11 CLANG_CXX_LIBRARY = libc++ +SPOTIFY_OS_CONFIG_PREPROCESSOR_DEFINITIONS_Debug = DEBUG=1 _DEBUG=1 +SPOTIFY_OS_CONFIG_PREPROCESSOR_DEFINITIONS_Release = +SPOTIFY_OS_CONFIG_PREPROCESSOR_DEFINITIONS = $(SPOTIFY_OS_CONFIG_PREPROCESSOR_DEFINITIONS_$(CONFIGURATION)) + +GCC_PREPROCESSOR_DEFINITIONS = $SPOTIFY_OS_CONFIG_PREPROCESSOR_DEFINITIONS + // Warnings: // Attribution: https://github.com/jonreid/XcodeWarnings From 3270bf2b9a72d285dec1a2fa2941b203e404b6b6 Mon Sep 17 00:00:00 2001 From: Aron Cedercrantz Date: Mon, 8 Feb 2016 15:06:50 +0100 Subject: [PATCH 7/7] Update schemes for Xcode 7.3 --- .../xcshareddata/xcschemes/SPTDataLoader.xcscheme | 5 +++-- .../xcshareddata/xcschemes/SPTDataLoaderDemo.xcscheme | 5 +++-- .../xcshareddata/xcschemes/SPTDataLoader-OSX.xcscheme | 5 +++-- .../xcshareddata/xcschemes/SPTDataLoader-TV.xcscheme | 5 +++-- .../xcshareddata/xcschemes/SPTDataLoader-Watch.xcscheme | 5 +++-- .../xcshareddata/xcschemes/SPTDataLoader-iOS.xcscheme | 5 +++-- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/SPTDataLoader.xcodeproj/xcshareddata/xcschemes/SPTDataLoader.xcscheme b/SPTDataLoader.xcodeproj/xcshareddata/xcschemes/SPTDataLoader.xcscheme index d9e51a36..27fcc35d 100644 --- a/SPTDataLoader.xcodeproj/xcshareddata/xcschemes/SPTDataLoader.xcscheme +++ b/SPTDataLoader.xcodeproj/xcshareddata/xcschemes/SPTDataLoader.xcscheme @@ -1,6 +1,6 @@ + buildForAnalyzing = "YES" + hideIssues = "NO"> + buildForAnalyzing = "YES" + hideIssues = "NO"> + buildForAnalyzing = "YES" + hideIssues = "NO"> + buildForAnalyzing = "YES" + hideIssues = "NO"> + buildForAnalyzing = "YES" + hideIssues = "NO"> + buildForAnalyzing = "YES" + hideIssues = "NO">