From 8e675dd79566ba9a65a28d1caafaa2b5f8b10400 Mon Sep 17 00:00:00 2001 From: Olof Hellman Date: Sun, 28 Jul 2019 14:45:18 -0700 Subject: [PATCH] make codesigning work with developerSettings --- xcconfig/NetNewsWireTests_target.xcconfig | 6 +++--- xcconfig/NetNewsWire_iOS_target.xcconfig | 7 ++++++- xcconfig/NetNewsWire_project_debug.xcconfig | 2 +- xcconfig/NetNewsWire_project_release.xcconfig | 2 +- xcconfig/NetNewsWire_target.xcconfig | 10 ++++++---- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/xcconfig/NetNewsWireTests_target.xcconfig b/xcconfig/NetNewsWireTests_target.xcconfig index 43abde52e..d62f4e2a9 100644 --- a/xcconfig/NetNewsWireTests_target.xcconfig +++ b/xcconfig/NetNewsWireTests_target.xcconfig @@ -4,13 +4,13 @@ CODE_SIGN_STYLE = Automatic // See the notes in NetNewsWire_target.xcconfig on why the // DeveloperSettings.xcconfig is #included here -#include "../../SharedXcodeSettings/DeveloperSettings.xcconfig" +#include? "../../SharedXcodeSettings/DeveloperSettings.xcconfig" ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES -COMBINE_HIDPI_IMAGES = YES BUNDLE_LOADER = $(TEST_HOST) -LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks +COMBINE_HIDPI_IMAGES = YES INFOPLIST_FILE = Tests/NetNewsWireTests/Info.plist +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.NetNewsWireTests PRODUCT_NAME = $(TARGET_NAME) TEST_HOST = $(BUILT_PRODUCTS_DIR)/NetNewsWire.app/Contents/MacOS/NetNewsWire diff --git a/xcconfig/NetNewsWire_iOS_target.xcconfig b/xcconfig/NetNewsWire_iOS_target.xcconfig index 8c0bca971..330eac1dd 100644 --- a/xcconfig/NetNewsWire_iOS_target.xcconfig +++ b/xcconfig/NetNewsWire_iOS_target.xcconfig @@ -12,7 +12,9 @@ PROVISIONING_PROFILE_SPECIFIER = // As an example, make a ../../SharedXcodeSettings/DeveloperSettings.xcconfig file and // give it the contents // -// CODE_SIGN_IDENTITY = Mac Developer +// CODE_SIGN_IDENTITY[sdk=macosx*] = Mac Developer +// CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer +// CODE_SIGN_IDENTITY[sdk=iphonesimulator*] = iPhone Developer // DEVELOPMENT_TEAM = // CODE_SIGN_STYLE = Automatic // PROVISIONING_PROFILE_SPECIFIER = @@ -26,13 +28,16 @@ PROVISIONING_PROFILE_SPECIFIER = // /Users/Shared/git/SharedXcodeSettings/DeveloperSettings.xcconfig // + #include? "../../SharedXcodeSettings/DeveloperSettings.xcconfig" ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES COMBINE_HIDPI_IMAGES = YES LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks INFOPLIST_FILE = NetNewsWire/iOS/Resources/Info.plist +IPHONEOS_DEPLOYMENT_TARGET = 13.0 PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.NetNewsWire-Evergreen.iOS PRODUCT_NAME = $(TARGET_NAME) FRAMEWORK_SEARCH_PATHS = $(inherited) $(PROJECT_DIR)/Frameworks/Vendor ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon + diff --git a/xcconfig/NetNewsWire_project_debug.xcconfig b/xcconfig/NetNewsWire_project_debug.xcconfig index f1adf871d..97b270b28 100644 --- a/xcconfig/NetNewsWire_project_debug.xcconfig +++ b/xcconfig/NetNewsWire_project_debug.xcconfig @@ -6,8 +6,8 @@ ENABLE_TESTABILITY = YES GCC_DYNAMIC_NO_PIC = NO GCC_OPTIMIZATION_LEVEL = 0 GCC_PREPROCESSOR_DEFINITIONS = DEBUG=1 $(inherited) +MTL_ENABLE_DEBUG_INFO = YES OTHER_SWIFT_FLAGS = -DDEBUG SWIFT_OPTIMIZATION_LEVEL = -Onone SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG -MTL_ENABLE_DEBUG_INFO = YES diff --git a/xcconfig/NetNewsWire_project_release.xcconfig b/xcconfig/NetNewsWire_project_release.xcconfig index 3923eb781..df0701857 100644 --- a/xcconfig/NetNewsWire_project_release.xcconfig +++ b/xcconfig/NetNewsWire_project_release.xcconfig @@ -2,7 +2,7 @@ DEBUG_INFORMATION_FORMAT = dwarf-with-dsym ENABLE_NS_ASSERTIONS = NO +MTL_ENABLE_DEBUG_INFO = NO OTHER_SWIFT_FLAGS = -DRELEASE SWIFT_OPTIMIZATION_LEVEL = -Owholemodule -MTL_ENABLE_DEBUG_INFO = NO diff --git a/xcconfig/NetNewsWire_target.xcconfig b/xcconfig/NetNewsWire_target.xcconfig index ba5cf39c7..1d8e62e04 100644 --- a/xcconfig/NetNewsWire_target.xcconfig +++ b/xcconfig/NetNewsWire_target.xcconfig @@ -12,7 +12,9 @@ PROVISIONING_PROFILE_SPECIFIER = // As an example, make a ../../SharedXcodeSettings/DeveloperSettings.xcconfig file and // give it the contents // -// CODE_SIGN_IDENTITY = Mac Developer +// CODE_SIGN_IDENTITY[sdk=macosx*] = Mac Developer +// CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer +// CODE_SIGN_IDENTITY[sdk=iphonesimulator*] = iPhone Developer // DEVELOPMENT_TEAM = // CODE_SIGN_STYLE = Automatic // PROVISIONING_PROFILE_SPECIFIER = @@ -29,10 +31,10 @@ PROVISIONING_PROFILE_SPECIFIER = #include? "../../SharedXcodeSettings/DeveloperSettings.xcconfig" ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES +ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon COMBINE_HIDPI_IMAGES = YES -LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks +FRAMEWORK_SEARCH_PATHS = $(inherited) $(PROJECT_DIR)/Frameworks/Vendor INFOPLIST_FILE = NetNewsWire/Info.plist +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.NetNewsWire-Evergreen PRODUCT_NAME = $(TARGET_NAME) -FRAMEWORK_SEARCH_PATHS = $(inherited) $(PROJECT_DIR)/Frameworks/Vendor -ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon