From cdc0d4702cd2120be875877123238fda5aa95f33 Mon Sep 17 00:00:00 2001 From: Arnold <40414978+PatriceJiang@users.noreply.github.com> Date: Mon, 6 Jan 2020 09:34:25 +0800 Subject: [PATCH] [bugfix] set CFBundleExectuable in template info.plist (#20425) fix #20414 --- .../cpp-template-default/proj.ios_mac/ios/Info.plist | 6 +++--- .../cpp-template-default/proj.ios_mac/mac/Info.plist | 4 ++-- .../frameworks/runtime-src/proj.ios_mac/ios/Info.plist | 8 +++++--- .../frameworks/runtime-src/proj.ios_mac/mac/Info.plist | 4 ++-- tests/cpp-empty-test/proj.ios/Info.plist | 6 +++--- tests/cpp-empty-test/proj.mac/Info.plist | 4 ++-- tests/cpp-tests/proj.ios/Info.plist | 6 +++--- tests/cpp-tests/proj.mac/Info.plist | 4 ++-- tests/lua-empty-test/project/proj.ios/Info.plist | 6 +++--- tests/lua-empty-test/project/proj.mac/Info.plist | 4 ++-- tests/lua-tests/project/proj.ios_mac/ios/Info.plist | 4 ++-- tests/lua-tests/project/proj.ios_mac/mac/Info.plist | 4 ++-- tests/performance-tests/proj.ios/Info.plist | 6 +++--- tests/performance-tests/proj.mac/Info.plist | 4 ++-- 14 files changed, 36 insertions(+), 34 deletions(-) diff --git a/templates/cpp-template-default/proj.ios_mac/ios/Info.plist b/templates/cpp-template-default/proj.ios_mac/ios/Info.plist index a0dcf58700..bfe2e3a8db 100644 --- a/templates/cpp-template-default/proj.ios_mac/ios/Info.plist +++ b/templates/cpp-template-default/proj.ios_mac/ios/Info.plist @@ -5,9 +5,9 @@ CFBundleDevelopmentRegion English CFBundleDisplayName - ${PRODUCT_NAME} + ${PROJECT_NAME} CFBundleExecutable - ${EXECUTABLE_NAME} + ${MACOSX_BUNDLE_EXECUTABLE_NAME} CFBundleIconFile Icon-57.png CFBundleIdentifier @@ -15,7 +15,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${PRODUCT_NAME} + ${PROJECT_NAME} CFBundleShortVersionString 1.0 CFBundlePackageType diff --git a/templates/cpp-template-default/proj.ios_mac/mac/Info.plist b/templates/cpp-template-default/proj.ios_mac/mac/Info.plist index 3b1fd784d9..55725148bf 100644 --- a/templates/cpp-template-default/proj.ios_mac/mac/Info.plist +++ b/templates/cpp-template-default/proj.ios_mac/mac/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleExecutable - ${EXECUTABLE_NAME} + ${MACOSX_BUNDLE_EXECUTABLE_NAME} CFBundleIconFile Icon CFBundleIdentifier @@ -13,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${PRODUCT_NAME} + ${PROJECT_NAME} CFBundlePackageType APPL CFBundleShortVersionString diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Info.plist b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Info.plist index 88a6ffefc1..fddda705dd 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Info.plist +++ b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Info.plist @@ -4,10 +4,12 @@ CFBundleDevelopmentRegion English + CFBundleIconFile Icon-57.png CFBundleIdentifier @@ -17,7 +19,7 @@ CFBundleVersion 1 CFBundleName - ${PRODUCT_NAME} + ${PROJECT_NAME} CFBundleShortVersionString 1.0 CFBundlePackageType diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/Info.plist b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/Info.plist index a80a4a07ba..d5df83ea38 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/Info.plist +++ b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleExecutable - ${EXECUTABLE_NAME} + ${MACOSX_BUNDLE_EXECUTABLE_NAME} CFBundleIconFile Icon CFBundleIdentifier @@ -13,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${PRODUCT_NAME} + ${PROJECT_NAME} CFBundlePackageType APPL CFBundleShortVersionString diff --git a/tests/cpp-empty-test/proj.ios/Info.plist b/tests/cpp-empty-test/proj.ios/Info.plist index 21eb693e55..fbb0b43463 100644 --- a/tests/cpp-empty-test/proj.ios/Info.plist +++ b/tests/cpp-empty-test/proj.ios/Info.plist @@ -5,9 +5,9 @@ CFBundleDevelopmentRegion English CFBundleDisplayName - ${PRODUCT_NAME} + ${PROJECT_NAME} CFBundleExecutable - ${EXECUTABLE_NAME} + ${MACOSX_BUNDLE_EXECUTABLE_NAME} CFBundleIconFile Icon-57.png CFBundleIconFiles @@ -28,7 +28,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${PRODUCT_NAME} + ${PROJECT_NAME} CFBundlePackageType APPL CFBundleShortVersionString diff --git a/tests/cpp-empty-test/proj.mac/Info.plist b/tests/cpp-empty-test/proj.mac/Info.plist index b187995273..16350063a1 100644 --- a/tests/cpp-empty-test/proj.mac/Info.plist +++ b/tests/cpp-empty-test/proj.mac/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleExecutable - ${EXECUTABLE_NAME} + ${MACOSX_BUNDLE_EXECUTABLE_NAME} CFBundleIconFile Icon CFBundleIdentifier @@ -13,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${PRODUCT_NAME} + ${PROJECT_NAME} CFBundlePackageType APPL CFBundleShortVersionString diff --git a/tests/cpp-tests/proj.ios/Info.plist b/tests/cpp-tests/proj.ios/Info.plist index 1666e58220..14bb2e6fea 100644 --- a/tests/cpp-tests/proj.ios/Info.plist +++ b/tests/cpp-tests/proj.ios/Info.plist @@ -5,9 +5,9 @@ CFBundleDevelopmentRegion English CFBundleDisplayName - ${PRODUCT_NAME} + ${PROJECT_NAME} CFBundleExecutable - ${EXECUTABLE_NAME} + ${MACOSX_BUNDLE_EXECUTABLE_NAME} CFBundleIconFile Icon CFBundleIdentifier @@ -15,7 +15,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${PRODUCT_NAME} + ${PROJECT_NAME} CFBundlePackageType APPL CFBundleShortVersionString diff --git a/tests/cpp-tests/proj.mac/Info.plist b/tests/cpp-tests/proj.mac/Info.plist index a0f571baab..0875be471c 100644 --- a/tests/cpp-tests/proj.mac/Info.plist +++ b/tests/cpp-tests/proj.mac/Info.plist @@ -7,7 +7,7 @@ CFBundleDevelopmentRegion en CFBundleExecutable - ${EXECUTABLE_NAME} + ${MACOSX_BUNDLE_EXECUTABLE_NAME} CFBundleIconFile Icon CFBundleIdentifier @@ -15,7 +15,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${PRODUCT_NAME} + ${PROJECT_NAME} CFBundlePackageType APPL CFBundleShortVersionString diff --git a/tests/lua-empty-test/project/proj.ios/Info.plist b/tests/lua-empty-test/project/proj.ios/Info.plist index 28d8a1bd49..545b82362a 100644 --- a/tests/lua-empty-test/project/proj.ios/Info.plist +++ b/tests/lua-empty-test/project/proj.ios/Info.plist @@ -5,9 +5,9 @@ CFBundleDevelopmentRegion English CFBundleDisplayName - ${PRODUCT_NAME} + ${PROJECT_NAME} CFBundleExecutable - ${EXECUTABLE_NAME} + ${MACOSX_BUNDLE_EXECUTABLE_NAME} CFBundleIconFile Icon-57.png CFBundleIcons @@ -19,7 +19,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${PRODUCT_NAME} + ${PROJECT_NAME} CFBundlePackageType APPL CFBundleShortVersionString diff --git a/tests/lua-empty-test/project/proj.mac/Info.plist b/tests/lua-empty-test/project/proj.mac/Info.plist index 974d250603..021f82e95d 100644 --- a/tests/lua-empty-test/project/proj.mac/Info.plist +++ b/tests/lua-empty-test/project/proj.mac/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleExecutable - ${EXECUTABLE_NAME} + ${MACOSX_BUNDLE_EXECUTABLE_NAME} CFBundleIconFile Icon CFBundleIdentifier @@ -13,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${PRODUCT_NAME} + ${PROJECT_NAME} CFBundlePackageType APPL CFBundleShortVersionString diff --git a/tests/lua-tests/project/proj.ios_mac/ios/Info.plist b/tests/lua-tests/project/proj.ios_mac/ios/Info.plist index 35428cc6a3..975fd4ae18 100644 --- a/tests/lua-tests/project/proj.ios_mac/ios/Info.plist +++ b/tests/lua-tests/project/proj.ios_mac/ios/Info.plist @@ -5,9 +5,9 @@ CFBundleDevelopmentRegion English CFBundleDisplayName - ${PRODUCT_NAME} + ${PROJECT_NAME} CFBundleExecutable - ${EXECUTABLE_NAME} + ${MACOSX_BUNDLE_EXECUTABLE_NAME} CFBundleIconFile Icon CFBundleIconFiles diff --git a/tests/lua-tests/project/proj.ios_mac/mac/Info.plist b/tests/lua-tests/project/proj.ios_mac/mac/Info.plist index c9425ef36a..7312cbf7f1 100644 --- a/tests/lua-tests/project/proj.ios_mac/mac/Info.plist +++ b/tests/lua-tests/project/proj.ios_mac/mac/Info.plist @@ -7,7 +7,7 @@ CFBundleDevelopmentRegion English CFBundleExecutable - ${EXECUTABLE_NAME} + ${MACOSX_BUNDLE_EXECUTABLE_NAME} CFBundleIconFile Icon CFBundleIdentifier @@ -15,7 +15,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${PRODUCT_NAME} + ${PROJECT_NAME} CFBundlePackageType APPL CFBundleShortVersionString diff --git a/tests/performance-tests/proj.ios/Info.plist b/tests/performance-tests/proj.ios/Info.plist index 64083fb00b..11f7c1339c 100644 --- a/tests/performance-tests/proj.ios/Info.plist +++ b/tests/performance-tests/proj.ios/Info.plist @@ -5,9 +5,9 @@ CFBundleDevelopmentRegion English CFBundleDisplayName - ${PRODUCT_NAME} + ${PROJECT_NAME} CFBundleExecutable - ${EXECUTABLE_NAME} + ${MACOSX_BUNDLE_EXECUTABLE_NAME} CFBundleIconFile Icon-57.png CFBundleIconFiles @@ -46,7 +46,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${PRODUCT_NAME} + ${PROJECT_NAME} CFBundlePackageType APPL CFBundleShortVersionString diff --git a/tests/performance-tests/proj.mac/Info.plist b/tests/performance-tests/proj.mac/Info.plist index 87d1c54408..95fc5f71bb 100644 --- a/tests/performance-tests/proj.mac/Info.plist +++ b/tests/performance-tests/proj.mac/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleExecutable - ${EXECUTABLE_NAME} + ${MACOSX_BUNDLE_EXECUTABLE_NAME} CFBundleIconFile Icon CFBundleIdentifier @@ -13,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${PRODUCT_NAME} + ${PROJECT_NAME} CFBundlePackageType APPL CFBundleShortVersionString