From ad3a072d760b3d3b56ac42a2002096a89ca9ed7a Mon Sep 17 00:00:00 2001 From: Vlad Shcherban Date: Mon, 29 May 2023 20:00:11 -0700 Subject: [PATCH] Removing resources before codesigning fixes #577 --- platform/resources/iPhonePackageApp.lua | 12 ++++++------ platform/shared/Rtt_PlatformAppPackager.h | 2 +- tools/CoronaBuilder/Rtt_AppPackagerAppleFactory.mm | 11 +++++++++-- tools/CoronaBuilder/Rtt_AppPackagerLinuxFactory.cpp | 2 +- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/platform/resources/iPhonePackageApp.lua b/platform/resources/iPhonePackageApp.lua index e0e915ac5..6e0b50000 100644 --- a/platform/resources/iPhonePackageApp.lua +++ b/platform/resources/iPhonePackageApp.lua @@ -962,6 +962,12 @@ local function packageApp( options ) end end + --remove standard resources(Corona Resources Bundle) if users selects + + if options.includeStandardResources == false then + runScript("rm -rf "..quoteString(makepath(appBundleFileUnquoted, "CoronaResources.bundle"))) + end + -- bundle is now ready to be signed (don't sign if we don't have a signingIdentity, e.g. Xcode Simulator) if options.signingIdentity then -- codesign embedded frameworks before signing the .app @@ -997,12 +1003,6 @@ local function packageApp( options ) runScript( "chmod 755 " .. appBundleFile ) - --remove standard resources(Corona Resources Bundle) if users selects - - if options.includeStandardResources == false then - runScript("rm -rf "..quoteString(makepath(appBundleFileUnquoted, "CoronaResources.bundle"))) - end - -- If building with a distribution identity, create an IPA of the .app which can be used by Application Loader local appBundleFileIPA = quoteString(makepath(options.dstDir, options.dstFile) .. ".ipa") -- remove old IPA for extra cleanliness, even if we are not building a new IPA for distribution (it's stale so let's remove it) diff --git a/platform/shared/Rtt_PlatformAppPackager.h b/platform/shared/Rtt_PlatformAppPackager.h index 34733a9d5..1afef7321 100644 --- a/platform/shared/Rtt_PlatformAppPackager.h +++ b/platform/shared/Rtt_PlatformAppPackager.h @@ -58,7 +58,7 @@ class AppPackagerParams bool fIncludeFusePlugins; bool fUsesMonetization; bool fLiveBuild; - bool fIncludeStandardResources; + bool fIncludeStandardResources = true; String fCoronaUser; public: diff --git a/tools/CoronaBuilder/Rtt_AppPackagerAppleFactory.mm b/tools/CoronaBuilder/Rtt_AppPackagerAppleFactory.mm index d758d4182..7c9826bdb 100644 --- a/tools/CoronaBuilder/Rtt_AppPackagerAppleFactory.mm +++ b/tools/CoronaBuilder/Rtt_AppPackagerAppleFactory.mm @@ -219,6 +219,11 @@ break; } + if ( ! result ) + { + fprintf( stderr, "ERROR: Unsupported platform: %s\n", TargetDevice::StringForPlatform( targetPlatform ) ); + } + lua_getfield(L, index, "customTemplate" ); if(lua_type(L, -1) == LUA_TSTRING) { @@ -226,10 +231,12 @@ } lua_pop(L, 1); - if ( ! result ) + lua_getfield(L, index, "includeStandardResources"); + if(lua_type(L, -1) == LUA_TBOOLEAN) { - fprintf( stderr, "ERROR: Unsupported platform: %s\n", TargetDevice::StringForPlatform( targetPlatform ) ); + result->SetIncludeStandardResources(lua_toboolean(L, -1)); } + lua_pop(L, 1); return result; } diff --git a/tools/CoronaBuilder/Rtt_AppPackagerLinuxFactory.cpp b/tools/CoronaBuilder/Rtt_AppPackagerLinuxFactory.cpp index e637ca6c7..c2e0525d3 100644 --- a/tools/CoronaBuilder/Rtt_AppPackagerLinuxFactory.cpp +++ b/tools/CoronaBuilder/Rtt_AppPackagerLinuxFactory.cpp @@ -45,7 +45,7 @@ namespace Rtt } bool includeStandardResources = true; - lua_getfield(L, index, "includeWidgetResources"); + lua_getfield(L, index, "includeStandardResources"); if(lua_type(L, -1) == LUA_TBOOLEAN) { includeStandardResources = lua_toboolean(L, -1);