diff --git a/AltStore.xcodeproj/project.pbxproj b/AltStore.xcodeproj/project.pbxproj index 9b0ad403..1cafc254 100644 --- a/AltStore.xcodeproj/project.pbxproj +++ b/AltStore.xcodeproj/project.pbxproj @@ -3238,7 +3238,6 @@ LD_WARN_DUPLICATE_LIBRARIES = YES; LD_WARN_UNUSED_DYLIBS = YES; PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)"; - "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = com.SideStore.SideStore.AltBackup; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/AltStoreCore.debug.xcconfig b/AltStoreCore.debug.xcconfig index 95853593..97314d99 100644 --- a/AltStoreCore.debug.xcconfig +++ b/AltStoreCore.debug.xcconfig @@ -1,6 +1,4 @@ -#include "Build.xcconfig" - -PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_BUNDLE_IDENTIFIER).AltStoreCore +#include "AltStoreCore.xcconfig" // include cocoa pods config #include? "Pods/Target Support Files/Pods-AltStoreCore/Pods-AltStoreCore.debug.xcconfig" diff --git a/AltStoreCore.release.xcconfig b/AltStoreCore.release.xcconfig index 31db00a9..f01cdd5a 100644 --- a/AltStoreCore.release.xcconfig +++ b/AltStoreCore.release.xcconfig @@ -1,6 +1,4 @@ -#include "Build.xcconfig" - -PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_BUNDLE_IDENTIFIER).AltStoreCore +#include "AltStoreCore.xcconfig" // include cocoa pods config #include? "Pods/Target Support Files/Pods-AltStoreCore/Pods-AltStoreCore.release.xcconfig" diff --git a/AltStoreCore.xcconfig b/AltStoreCore.xcconfig new file mode 100644 index 00000000..7bbddb2e --- /dev/null +++ b/AltStoreCore.xcconfig @@ -0,0 +1,6 @@ +#include "Build.xcconfig" + +// Since AltStoreCore is unsigned or the team is not configured, we re-define the bundle ID here to not have extra '.' +// This bundle ID doesn't need to change since altStoreCore framework lives inside SideStore main app's address space and won't have conflicts with other instances +BUNDLE_ID = $(ORG_PREFIX).SideStore +PRODUCT_BUNDLE_IDENTIFIER = $(BUNDLE_ID).AltStoreCore diff --git a/Build.xcconfig b/Build.xcconfig index e8ccbedf..b49eb336 100644 --- a/Build.xcconfig +++ b/Build.xcconfig @@ -16,8 +16,9 @@ ORG_PREFIX = $(ORG_IDENTIFIER) PRODUCT_NAME = SideStore //PRODUCT_NAME[configuration=Debug] = Prov Debug -PRODUCT_BUNDLE_IDENTIFIER[config=Debug] = $(ORG_PREFIX).SideStore$(DEBUG_BUNDLE_ID_SUFFIX) -PRODUCT_BUNDLE_IDENTIFIER[config=Release] = $(ORG_PREFIX).SideStore +//PRODUCT_BUNDLE_IDENTIFIER[config=Debug] = $(ORG_PREFIX).SideStore$(BUNDLE_ID_SUFFIX) +//PRODUCT_BUNDLE_IDENTIFIER[config=Release] = $(ORG_PREFIX).SideStore +PRODUCT_BUNDLE_IDENTIFIER = $(ORG_PREFIX).SideStore$(BUNDLE_ID_SUFFIX) EXTENSION_PREFIX = $(PRODUCT_BUNDLE_IDENTIFIER) APP_GROUP_IDENTIFIER = $(PRODUCT_BUNDLE_IDENTIFIER) diff --git a/Makefile b/Makefile index cd89bf1f..bb9d16ae 100755 --- a/Makefile +++ b/Makefile @@ -198,7 +198,8 @@ build: print_release_type CODE_SIGNING_ALLOWED=NO \ DEVELOPMENT_TEAM=XYZ0123456 \ ORG_IDENTIFIER=com.SideStore \ - BUILD_REVISION=$(ALPHA_COMMIT_ID) + BUILD_REVISION=$(ALPHA_COMMIT_ID) \ + BUNDLE_ID_SUFFIX= # DWARF_DSYM_FOLDER_PATH="." fakesign: @@ -321,6 +322,6 @@ ipa-altbackup: checkPaths copy-altbackup clean: @rm -rf *.xcarchive/ @rm -rf *.dSYM/ - @rm -rf *.ipa/ + @rm -rf *.ipa @rm -rf build/ @rm -rf Payload/