From 4441219df9049bd3ef3bf7600faf3f2cf706a4ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Sat, 29 May 2021 10:51:00 +0700 Subject: [PATCH 1/3] Always prefix bundle ID with com --- pkg/apple/RetroArch.xcodeproj/project.pbxproj | 8 ++++---- pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj | 4 ++-- pkg/apple/RetroArch_OSX107.xcodeproj/project.pbxproj | 8 ++++---- travis_metal_deploy.sh | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkg/apple/RetroArch.xcodeproj/project.pbxproj b/pkg/apple/RetroArch.xcodeproj/project.pbxproj index 40eb512645..e7faf3ee16 100644 --- a/pkg/apple/RetroArch.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch.xcodeproj/project.pbxproj @@ -406,7 +406,7 @@ "-DHAVE_CG", ); PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES; - PRODUCT_BUNDLE_IDENTIFIER = libretro.RetroArch; + PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArch; PRODUCT_NAME = RetroArchCg; PROVISIONING_PROFILE_SPECIFIER = ""; }; @@ -448,7 +448,7 @@ "-DHAVE_CG", ); PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES; - PRODUCT_BUNDLE_IDENTIFIER = libretro.RetroArch; + PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArch; PRODUCT_NAME = RetroArchCg; PROVISIONING_PROFILE_SPECIFIER = ""; }; @@ -489,7 +489,7 @@ INSTALL_PATH = "$(HOME)/Applications"; MACOSX_DEPLOYMENT_TARGET = 10.6; PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES; - PRODUCT_BUNDLE_IDENTIFIER = libretro.RetroArch; + PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArch; PRODUCT_NAME = RetroArch; PROVISIONING_PROFILE_SPECIFIER = ""; }; @@ -528,7 +528,7 @@ INSTALL_PATH = "$(HOME)/Applications"; MACOSX_DEPLOYMENT_TARGET = 10.6; PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES; - PRODUCT_BUNDLE_IDENTIFIER = libretro.RetroArch; + PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArch; PRODUCT_NAME = RetroArch; PROVISIONING_PROFILE_SPECIFIER = ""; }; diff --git a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj index e3a45637c4..aeac0c55af 100644 --- a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj @@ -1656,7 +1656,7 @@ "-UHAVE_OPENGL", ); PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES; - PRODUCT_BUNDLE_IDENTIFIER = libretro.RetroArch; + PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArch; PRODUCT_NAME = RetroArch; PROVISIONING_PROFILE_SPECIFIER = ""; }; @@ -1694,7 +1694,7 @@ "-UHAVE_OPENGL", ); PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES; - PRODUCT_BUNDLE_IDENTIFIER = libretro.RetroArch; + PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArch; PRODUCT_NAME = RetroArch; PROVISIONING_PROFILE_SPECIFIER = ""; }; diff --git a/pkg/apple/RetroArch_OSX107.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_OSX107.xcodeproj/project.pbxproj index d626713bc1..4a6b3df3f0 100644 --- a/pkg/apple/RetroArch_OSX107.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_OSX107.xcodeproj/project.pbxproj @@ -405,7 +405,7 @@ "-DHAVE_CG", ); PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES; - PRODUCT_BUNDLE_IDENTIFIER = libretro.RetroArch; + PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArch; PRODUCT_NAME = RetroArchCg; }; name = Debug; @@ -448,7 +448,7 @@ "-DHAVE_CG", ); PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES; - PRODUCT_BUNDLE_IDENTIFIER = libretro.RetroArch; + PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArch; PRODUCT_NAME = RetroArchCg; }; name = Release; @@ -489,7 +489,7 @@ INSTALL_PATH = "$(HOME)/Applications"; MACOSX_DEPLOYMENT_TARGET = 10.7; PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES; - PRODUCT_BUNDLE_IDENTIFIER = libretro.RetroArch; + PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArch; PRODUCT_NAME = RetroArch; }; name = Debug; @@ -536,7 +536,7 @@ INSTALL_PATH = "$(HOME)/Applications"; MACOSX_DEPLOYMENT_TARGET = 10.7; PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES; - PRODUCT_BUNDLE_IDENTIFIER = libretro.RetroArch; + PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArch; PRODUCT_NAME = RetroArch; }; name = Release; diff --git a/travis_metal_deploy.sh b/travis_metal_deploy.sh index 733528c3f1..449691875c 100644 --- a/travis_metal_deploy.sh +++ b/travis_metal_deploy.sh @@ -36,7 +36,7 @@ cp -f ~/${FILENAME} ~/RetroArch_Metal.dmg echo "Notarizing DMG..." codesign --force --verbose --timestamp --sign "7069CC8A4AE9AFF0493CC539BBA4FA345F0A668B" ~/RetroArch_Metal.dmg -REQUESTUUID=$(xcrun altool --notarize-app -t osx -f ~/RetroArch_Metal.dmg --primary-bundle-id libretro.RetroArch -u $APPLE_ID -p $APPLE_ID_PASS -itc_provider UK699V5ZS8 | awk '/RequestUUID/ { print $NF; }') +REQUESTUUID=$(xcrun altool --notarize-app -t osx -f ~/RetroArch_Metal.dmg --primary-bundle-id com.libretro.RetroArch -u $APPLE_ID -p $APPLE_ID_PASS -itc_provider UK699V5ZS8 | awk '/RequestUUID/ { print $NF; }') sleep 200 xcrun altool --notarization-info $REQUESTUUID -u $APPLE_ID -p $APPLE_ID_PASS -ascprovider UK699V5ZS8 xcrun stapler staple ~/RetroArch_Metal.dmg From 4a8fdaed84d87b31bea19824a145fec958ec96a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Sat, 29 May 2021 10:54:26 +0700 Subject: [PATCH 2/3] Don't duplicate bundle IDs --- pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj | 4 ++-- pkg/apple/RetroArch_OSX107.xcodeproj/project.pbxproj | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj index aeac0c55af..a7924a2f6b 100644 --- a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj @@ -1656,7 +1656,7 @@ "-UHAVE_OPENGL", ); PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArch; + PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArchM; PRODUCT_NAME = RetroArch; PROVISIONING_PROFILE_SPECIFIER = ""; }; @@ -1694,7 +1694,7 @@ "-UHAVE_OPENGL", ); PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArch; + PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArchM; PRODUCT_NAME = RetroArch; PROVISIONING_PROFILE_SPECIFIER = ""; }; diff --git a/pkg/apple/RetroArch_OSX107.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_OSX107.xcodeproj/project.pbxproj index 4a6b3df3f0..a72182e22e 100644 --- a/pkg/apple/RetroArch_OSX107.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_OSX107.xcodeproj/project.pbxproj @@ -405,7 +405,7 @@ "-DHAVE_CG", ); PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArch; + PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArchOSX107; PRODUCT_NAME = RetroArchCg; }; name = Debug; @@ -448,7 +448,7 @@ "-DHAVE_CG", ); PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArch; + PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArchOSX107; PRODUCT_NAME = RetroArchCg; }; name = Release; @@ -489,7 +489,7 @@ INSTALL_PATH = "$(HOME)/Applications"; MACOSX_DEPLOYMENT_TARGET = 10.7; PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArch; + PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArchOSX107; PRODUCT_NAME = RetroArch; }; name = Debug; @@ -536,7 +536,7 @@ INSTALL_PATH = "$(HOME)/Applications"; MACOSX_DEPLOYMENT_TARGET = 10.7; PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArch; + PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArchOSX107; PRODUCT_NAME = RetroArch; }; name = Release; From 5a7cebf7da11c75d99a68cfbf36c5917597bda24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Sat, 29 May 2021 11:03:35 +0700 Subject: [PATCH 3/3] Last fix --- travis_metal_deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis_metal_deploy.sh b/travis_metal_deploy.sh index 449691875c..d76603133b 100644 --- a/travis_metal_deploy.sh +++ b/travis_metal_deploy.sh @@ -36,7 +36,7 @@ cp -f ~/${FILENAME} ~/RetroArch_Metal.dmg echo "Notarizing DMG..." codesign --force --verbose --timestamp --sign "7069CC8A4AE9AFF0493CC539BBA4FA345F0A668B" ~/RetroArch_Metal.dmg -REQUESTUUID=$(xcrun altool --notarize-app -t osx -f ~/RetroArch_Metal.dmg --primary-bundle-id com.libretro.RetroArch -u $APPLE_ID -p $APPLE_ID_PASS -itc_provider UK699V5ZS8 | awk '/RequestUUID/ { print $NF; }') +REQUESTUUID=$(xcrun altool --notarize-app -t osx -f ~/RetroArch_Metal.dmg --primary-bundle-id com.libretro.RetroArchM -u $APPLE_ID -p $APPLE_ID_PASS -itc_provider UK699V5ZS8 | awk '/RequestUUID/ { print $NF; }') sleep 200 xcrun altool --notarization-info $REQUESTUUID -u $APPLE_ID -p $APPLE_ID_PASS -ascprovider UK699V5ZS8 xcrun stapler staple ~/RetroArch_Metal.dmg