From c261e88bbd336a4fcd32d78ce72af1c0af2cbfc6 Mon Sep 17 00:00:00 2001 From: "Benjamin Scholtysik (Reimold)" Date: Fri, 30 Sep 2016 11:15:47 -0700 Subject: [PATCH] Simplify build configurations. --- Support/HockeySDK.xcconfig | 4 ---- Support/HockeySDK.xcodeproj/project.pbxproj | 10 +++------- Support/HockeySDKBase.xcconfig | 19 +++++++++++++++++++ Support/allfeatures.xcconfig | 2 +- .../{buildnumber.xcconfig => base.xcconfig} | 0 Support/crashonly.xcconfig | 2 +- Support/crashonlyextensions.xcconfig | 2 +- Support/default.xcconfig | 2 +- Support/release.xcconfig | 1 - 9 files changed, 26 insertions(+), 16 deletions(-) delete mode 100644 Support/HockeySDK.xcconfig create mode 100644 Support/HockeySDKBase.xcconfig rename Support/{buildnumber.xcconfig => base.xcconfig} (100%) delete mode 100644 Support/release.xcconfig diff --git a/Support/HockeySDK.xcconfig b/Support/HockeySDK.xcconfig deleted file mode 100644 index 48338cc0a6..0000000000 --- a/Support/HockeySDK.xcconfig +++ /dev/null @@ -1,4 +0,0 @@ -OTHER_LDFLAGS=$(inherited) -framework CrashReporter -framework AssetsLibrary -framework CoreTelephony -framework CoreText -framework CoreGraphics -framework Foundation -framework MobileCoreServices -framework Photos -framework QuartzCore -framework QuickLook -framework Security -framework SystemConfiguration -framework UIKit -lc++ -lz -HOCKEYSDK_DOCSET_NAME=HockeySDK-iOS -HOCKEYSDK_GCC_PREPROCESSOR_DEFINITIONS=$(inherited) $(XCODEBUILD_GCC_PREPROCESSOR_DEFINITIONS) -HOCKEYSDK_WARNING_FLAGS = -Wshorten-64-to-32 -Wall \ No newline at end of file diff --git a/Support/HockeySDK.xcodeproj/project.pbxproj b/Support/HockeySDK.xcodeproj/project.pbxproj index 00093df3db..12f02cc7f3 100644 --- a/Support/HockeySDK.xcodeproj/project.pbxproj +++ b/Support/HockeySDK.xcodeproj/project.pbxproj @@ -562,14 +562,13 @@ 1E5A459A16F0DFC200B55C04 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 1E5A459D16F0DFC200B55C04 /* BITStoreUpdateManagerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BITStoreUpdateManagerTests.m; sourceTree = ""; }; 1E61CCAE18E0585A00A5E38E /* BITFeedbackManagerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITFeedbackManagerTests.m; sourceTree = ""; }; - 1E66CA9115D4100500F35BED /* buildnumber.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = buildnumber.xcconfig; sourceTree = ""; }; 1E6F0450167B5E5600ED1C86 /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/HockeySDK.strings"; sourceTree = ""; }; 1E70A22F17F2F982001BB32D /* live_report_empty.plcrash */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = live_report_empty.plcrash; sourceTree = ""; }; 1E70A23017F2F982001BB32D /* live_report_exception.plcrash */ = {isa = PBXFileReference; lastKnownFileType = file; path = live_report_exception.plcrash; sourceTree = ""; }; 1E70A23117F2F982001BB32D /* live_report_signal.plcrash */ = {isa = PBXFileReference; lastKnownFileType = file; path = live_report_signal.plcrash; sourceTree = ""; }; 1E70A23517F31B82001BB32D /* BITHockeyHelperTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITHockeyHelperTests.m; sourceTree = ""; }; 1E71509A15B5C76F004E88FF /* HockeySDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HockeySDK.h; sourceTree = ""; }; - 1E754DC61621BC170070AB92 /* HockeySDK.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = HockeySDK.xcconfig; sourceTree = ""; }; + 1E754DC61621BC170070AB92 /* HockeySDKBase.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = HockeySDKBase.xcconfig; sourceTree = ""; }; 1E754E561621FBB70070AB92 /* BITCrashManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITCrashManager.h; sourceTree = ""; }; 1E754E571621FBB70070AB92 /* BITCrashManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITCrashManager.m; sourceTree = ""; }; 1E754E581621FBB70070AB92 /* BITCrashManagerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITCrashManagerDelegate.h; sourceTree = ""; }; @@ -685,7 +684,6 @@ 8042A7F41CC507B700B603FE /* BITHockeyLoggerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITHockeyLoggerPrivate.h; sourceTree = ""; }; 80668C721C8CD93B00A133D3 /* BITEventData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITEventData.h; sourceTree = ""; }; 80668C731C8CD93B00A133D3 /* BITEventData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITEventData.m; sourceTree = ""; }; - 80720BAF1D86FF680038B9C6 /* release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = release.xcconfig; sourceTree = ""; }; 8077563F1BC6A44D0037C3DA /* HockeySDKEnums.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HockeySDKEnums.h; sourceTree = ""; }; 807F75041C9AEDAA009E6DCB /* BITChannelPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITChannelPrivate.h; sourceTree = ""; }; 8080576B1C5818AE00BB319D /* BITHockeyLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITHockeyLogger.h; sourceTree = ""; }; @@ -917,13 +915,11 @@ B29855431D85EBAC007FF452 /* module_allfeatures.modulemap */, 1E85C5A11B35BD7000CE2C0D /* module_crashonly.modulemap */, 1E91D84619B924E600E9616D /* module_default.modulemap */, + 1E754DC61621BC170070AB92 /* HockeySDKBase.xcconfig */, B29855421D85EB5D007FF452 /* allfeatures.xcconfig */, - 1E66CA9115D4100500F35BED /* buildnumber.xcconfig */, 1E7DE39619D44DC6009AB8E5 /* crashonly.xcconfig */, 1E27E60A1B74F01400192AE2 /* crashonlyextensions.xcconfig */, 1E45A90E1B78DB0C002CA772 /* default.xcconfig */, - 1E754DC61621BC170070AB92 /* HockeySDK.xcconfig */, - 80720BAF1D86FF680038B9C6 /* release.xcconfig */, ); name = Support; sourceTree = ""; @@ -3368,7 +3364,7 @@ }; E400563C148D79B500EB22B9 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1E66CA9115D4100500F35BED /* buildnumber.xcconfig */; + baseConfigurationReference = 1E754DC61621BC170070AB92 /* HockeySDKBase.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; diff --git a/Support/HockeySDKBase.xcconfig b/Support/HockeySDKBase.xcconfig new file mode 100644 index 0000000000..d1554d3233 --- /dev/null +++ b/Support/HockeySDKBase.xcconfig @@ -0,0 +1,19 @@ +BUILD_NUMBER = 96 +VERSION_STRING = 4.1.1 +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) $(HOCKEYSDK_GCC_PREPROCESSOR_DEFINITIONS) HOCKEYSDK_CONFIGURATION_$(CONFIGURATION) BITHOCKEY_VERSION="@\""$(VERSION_STRING)"\"" BITHOCKEY_BUILD="@\""$(BUILD_NUMBER)"\"" BITHOCKEY_C_VERSION="\""$(VERSION_STRING)"\"" BITHOCKEY_C_BUILD="\""$(BUILD_NUMBER)"\"" +BIT_ARM_ARCHS = armv7 armv7s arm64 +BIT_SIM_ARCHS = x86_64 i386 +ARCHS = $(BIT_ARM_ARCHS) +VALID_ARCHS = $(BIT_ARM_ARCHS) +OTHER_CFLAGS = $(HOCKEYSDK_WARNING_FLAGS) +OTHER_CFLAGS[sdk=iphoneos9.*] = $(HOCKEYSDK_WARNING_FLAGS) -fembed-bitcode +OTHER_CFLAGS[sdk=iphonesimulator9.*] = $(HOCKEYSDK_WARNING_FLAGS) -fembed-bitcode-marker +OTHER_CFLAGS[sdk=iphoneos10.*] = $(HOCKEYSDK_WARNING_FLAGS) -fembed-bitcode +OTHER_CFLAGS[sdk=iphonesimulator10.*] = $(HOCKEYSDK_WARNING_FLAGS) -fembed-bitcode-marker + + + +OTHER_LDFLAGS=$(inherited) -framework CrashReporter -framework AssetsLibrary -framework CoreTelephony -framework CoreText -framework CoreGraphics -framework Foundation -framework MobileCoreServices -framework Photos -framework QuartzCore -framework QuickLook -framework Security -framework SystemConfiguration -framework UIKit -lc++ -lz +HOCKEYSDK_DOCSET_NAME=HockeySDK-iOS +HOCKEYSDK_GCC_PREPROCESSOR_DEFINITIONS=$(inherited) $(XCODEBUILD_GCC_PREPROCESSOR_DEFINITIONS) +HOCKEYSDK_WARNING_FLAGS = -Wshorten-64-to-32 -Wall \ No newline at end of file diff --git a/Support/allfeatures.xcconfig b/Support/allfeatures.xcconfig index 0c75ac3d1e..cf41bef4b5 100644 --- a/Support/allfeatures.xcconfig +++ b/Support/allfeatures.xcconfig @@ -1,3 +1,3 @@ -#include "release.xcconfig" +#include "HockeySDKBase.xcconfig" // We don't have to specify usage of the features for the "AllFeatures"-config as the default in the feautre-config-header is "1". \ No newline at end of file diff --git a/Support/buildnumber.xcconfig b/Support/base.xcconfig similarity index 100% rename from Support/buildnumber.xcconfig rename to Support/base.xcconfig diff --git a/Support/crashonly.xcconfig b/Support/crashonly.xcconfig index 3c1667cbeb..8cd6af47dc 100644 --- a/Support/crashonly.xcconfig +++ b/Support/crashonly.xcconfig @@ -1,3 +1,3 @@ -#include "release.xcconfig" +#include "HockeySDKBase.xcconfig" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) HOCKEYSDK_CONFIGURATION_$(CONFIGURATION) HOCKEYSDK_FEATURE_CRASH_REPORTER=1 HOCKEYSDK_FEATURE_FEEDBACK=0 HOCKEYSDK_FEATURE_STORE_UPDATES=0 HOCKEYSDK_FEATURE_AUTHENTICATOR=0 HOCKEYSDK_FEATURE_UPDATES=0 HOCKEYSDK_FEATURE_METRICS=1 BITHOCKEY_VERSION="@\""$(VERSION_STRING)"\"" BITHOCKEY_BUILD="@\""$(BUILD_NUMBER)"\"" BITHOCKEY_C_VERSION="\""$(VERSION_STRING)"\"" BITHOCKEY_C_BUILD="\""$(BUILD_NUMBER)"\"" diff --git a/Support/crashonlyextensions.xcconfig b/Support/crashonlyextensions.xcconfig index f3e4790d22..3eb3163042 100644 --- a/Support/crashonlyextensions.xcconfig +++ b/Support/crashonlyextensions.xcconfig @@ -1,3 +1,3 @@ -#include "release.xcconfig" +#include "HockeySDKBase.xcconfig" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) HOCKEYSDK_CONFIGURATION_$(CONFIGURATION) HOCKEYSDK_FEATURE_CRASH_REPORTER=1 HOCKEYSDK_FEATURE_FEEDBACK=0 HOCKEYSDK_FEATURE_STORE_UPDATES=0 HOCKEYSDK_FEATURE_AUTHENTICATOR=0 HOCKEYSDK_FEATURE_UPDATES=0 HOCKEYSDK_FEATURE_METRICS=0 BITHOCKEY_VERSION="@\""$(VERSION_STRING)"\"" BITHOCKEY_BUILD="@\""$(BUILD_NUMBER)"\"" BITHOCKEY_C_VERSION="\""$(VERSION_STRING)"\"" BITHOCKEY_C_BUILD="\""$(BUILD_NUMBER)"\"" diff --git a/Support/default.xcconfig b/Support/default.xcconfig index 07ceb06e3d..39e2a759a6 100644 --- a/Support/default.xcconfig +++ b/Support/default.xcconfig @@ -1,3 +1,3 @@ -#include "release.xcconfig" +#include "HockeySDKBase.xcconfig" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) HOCKEYSDK_CONFIGURATION_$(CONFIGURATION) HOCKEYSDK_FEATURE_CRASH_REPORTER=1 HOCKEYSDK_FEATURE_FEEDBACK=0 HOCKEYSDK_FEATURE_STORE_UPDATES=1 HOCKEYSDK_FEATURE_AUTHENTICATOR=1 HOCKEYSDK_FEATURE_UPDATES=1 HOCKEYSDK_FEATURE_METRICS=1 BITHOCKEY_VERSION="@\""$(VERSION_STRING)"\"" BITHOCKEY_BUILD="@\""$(BUILD_NUMBER)"\"" BITHOCKEY_C_VERSION="\""$(VERSION_STRING)"\"" BITHOCKEY_C_BUILD="\""$(BUILD_NUMBER)"\"" \ No newline at end of file diff --git a/Support/release.xcconfig b/Support/release.xcconfig deleted file mode 100644 index 3a0a1418c1..0000000000 --- a/Support/release.xcconfig +++ /dev/null @@ -1 +0,0 @@ -#include "buildnumber.xcconfig"