From af5cf0a33f78f401a535e21badbfccb7e8535829 Mon Sep 17 00:00:00 2001 From: zhangbin Date: Tue, 8 Jul 2014 10:22:08 +0800 Subject: [PATCH] Add configuration in templates to set the bundle identity of Mac & iOS project. --- .../cpp-template-default/cocos-project-template.json | 12 ++++++++++++ .../cpp-template-default/proj.ios_mac/ios/Info.plist | 2 +- .../cpp-template-default/proj.ios_mac/mac/Info.plist | 2 +- .../lua-template-default/cocos-project-template.json | 12 ++++++++++++ .../runtime-src/proj.ios_mac/ios/Info.plist | 2 +- .../runtime-src/proj.ios_mac/mac/Info.plist | 2 +- .../lua-template-runtime/cocos-project-template.json | 12 ++++++++++++ .../runtime-src/proj.ios_mac/ios/Info.plist | 2 +- .../runtime-src/proj.ios_mac/mac/Info.plist | 2 +- tools/cocos2d-console | 2 +- 10 files changed, 43 insertions(+), 7 deletions(-) diff --git a/templates/cpp-template-default/cocos-project-template.json b/templates/cpp-template-default/cocos-project-template.json index ab35bb7a12..9d4ee7d291 100644 --- a/templates/cpp-template-default/cocos-project-template.json +++ b/templates/cpp-template-default/cocos-project-template.json @@ -44,6 +44,18 @@ "files":[ "proj.android/AndroidManifest.xml" ] + }, + "project_replace_mac_bundleid": { + "src_bundle_id": "org.cocos2dx.hellocpp", + "files": [ + "proj.ios_mac/mac/Info.plist" + ] + }, + "project_replace_ios_bundleid": { + "src_bundle_id": "org.cocos2dx.hellocpp", + "files": [ + "proj.ios_mac/ios/Info.plist" + ] } } } 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 aff7e3c69e..9613e3c273 100644 --- a/templates/cpp-template-default/proj.ios_mac/ios/Info.plist +++ b/templates/cpp-template-default/proj.ios_mac/ios/Info.plist @@ -42,7 +42,7 @@ Icon-144.png CFBundleIdentifier - org.cocos2d-x.${PRODUCT_NAME:rfc1034identifier} + org.cocos2dx.hellocpp CFBundleInfoDictionaryVersion 6.0 CFBundleName 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 a73feb76e9..3b1fd784d9 100644 --- a/templates/cpp-template-default/proj.ios_mac/mac/Info.plist +++ b/templates/cpp-template-default/proj.ios_mac/mac/Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile Icon CFBundleIdentifier - org.cocos2d-x.${PRODUCT_NAME:rfc1034identifier} + org.cocos2dx.hellocpp CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/templates/lua-template-default/cocos-project-template.json b/templates/lua-template-default/cocos-project-template.json index 8b3330d819..0eac97ab0f 100644 --- a/templates/lua-template-default/cocos-project-template.json +++ b/templates/lua-template-default/cocos-project-template.json @@ -56,6 +56,18 @@ "files":[ "frameworks/runtime-src/proj.android/AndroidManifest.xml" ] + }, + "project_replace_mac_bundleid": { + "src_bundle_id": "org.cocos2dx.hellolua", + "files": [ + "frameworks/runtime-src/proj.ios_mac/mac/Info.plist" + ] + }, + "project_replace_ios_bundleid": { + "src_bundle_id": "org.cocos2dx.hellolua", + "files": [ + "frameworks/runtime-src/proj.ios_mac/ios/Info.plist" + ] } } } 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 105ea833f0..ac80cbf650 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 @@ -38,7 +38,7 @@ Icon-144.png CFBundleIdentifier - org.cocos2d-x.${PRODUCT_NAME:rfc1034identifier} + org.cocos2dx.hellolua CFBundleInfoDictionaryVersion 6.0 CFBundleName 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 a73feb76e9..f72b36417b 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 @@ -9,7 +9,7 @@ CFBundleIconFile Icon CFBundleIdentifier - org.cocos2d-x.${PRODUCT_NAME:rfc1034identifier} + org.cocos2dx.hellolua CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/templates/lua-template-runtime/cocos-project-template.json b/templates/lua-template-runtime/cocos-project-template.json index 75e0860770..fe5231abd3 100644 --- a/templates/lua-template-runtime/cocos-project-template.json +++ b/templates/lua-template-runtime/cocos-project-template.json @@ -156,6 +156,18 @@ "files": [ "frameworks/runtime-src/proj.android/AndroidManifest.xml" ] + }, + "project_replace_mac_bundleid": { + "src_bundle_id": "org.cocos2dx.hellolua", + "files": [ + "frameworks/runtime-src/proj.ios_mac/mac/Info.plist" + ] + }, + "project_replace_ios_bundleid": { + "src_bundle_id": "org.cocos2dx.hellolua", + "files": [ + "frameworks/runtime-src/proj.ios_mac/ios/Info.plist" + ] } } } diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/Info.plist b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/Info.plist index 8c1b27a35d..2b8d4ae1c0 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/Info.plist +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/Info.plist @@ -38,7 +38,7 @@ Icon-144.png CFBundleIdentifier - org.cocos2d-x.${PRODUCT_NAME:rfc1034identifier} + org.cocos2dx.hellolua CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/Info.plist b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/Info.plist index a73feb76e9..f72b36417b 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/Info.plist +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile Icon CFBundleIdentifier - org.cocos2d-x.${PRODUCT_NAME:rfc1034identifier} + org.cocos2dx.hellolua CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/tools/cocos2d-console b/tools/cocos2d-console index 95f46b1de5..7fc616bcbc 160000 --- a/tools/cocos2d-console +++ b/tools/cocos2d-console @@ -1 +1 @@ -Subproject commit 95f46b1de52811822a6d5b6bdb227bfb644c2cc5 +Subproject commit 7fc616bcbcfd9b60e8b1188ba974e4f66621beb8