diff options
| -rwxr-xr-x | chrome/chrome.gyp | 16 | ||||
| -rwxr-xr-x | chrome/tools/build/mac/tweak_info_plist (renamed from build/mac/tweak_app_infoplist) | 8 |
2 files changed, 14 insertions, 10 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 662ba507..c072347 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -140,6 +140,7 @@ ], },], ['OS=="mac"', { + 'tweak_info_plist_path': 'tools/build/mac/tweak_info_plist', 'nacl_defines': [ 'NACL_WINDOWS=0', 'NACL_LINUX=0', @@ -3572,11 +3573,12 @@ # Keystone information; that all goes into the framework's # Info.plist. Use -s1 to include Subversion information. 'postbuild_name': 'Tweak Info.plist', - 'action': ['<(DEPTH)/build/mac/tweak_app_infoplist', + 'action': ['<(tweak_info_plist_path)', '-b0', '-k0', '-s1', - '<(branding)'], + '<(branding)', + '<(mac_bundle_id)'], }, { 'postbuild_name': 'Tweak Mac lproj folders', @@ -5243,11 +5245,12 @@ # Subversion keys for anything, but this seems like a really # good place to store them. 'postbuild_name': 'Tweak Info.plist', - 'action': ['<(DEPTH)/build/mac/tweak_app_infoplist', + 'action': ['<(tweak_info_plist_path)', '-b<(mac_breakpad)', '-k<(mac_keystone)', '-s1', - '<(branding)'], + '<(branding)', + '<(mac_bundle_id)'], }, { 'postbuild_name': 'Tweak Mac lproj folders', @@ -5467,11 +5470,12 @@ # the framework. -s0 is used because Subversion keys are only # placed into the main app. 'postbuild_name': 'Tweak Info.plist', - 'action': ['<(DEPTH)/build/mac/tweak_app_infoplist', + 'action': ['<(tweak_info_plist_path)', '-b0', '-k0', '-s0', - '<(branding)'], + '<(branding)', + '<(mac_bundle_id)'], }, { 'postbuild_name': 'Tweak Mac lproj folders', diff --git a/build/mac/tweak_app_infoplist b/chrome/tools/build/mac/tweak_info_plist index f28d04d..27c1e73 100755 --- a/build/mac/tweak_app_infoplist +++ b/chrome/tools/build/mac/tweak_info_plist @@ -39,8 +39,8 @@ done shift $(($OPTIND - 1)) # Make sure the branding argument was supplied. -if [ $# -ne 1 ]; then - echo "error: missing branding as an argument" >&2 +if [ $# -ne 2 ]; then + echo "usage: $0 [-b 1] [-k 1] [-s 1] BRANDING IDENTIFIER" >&2 exit 1 fi @@ -62,6 +62,7 @@ fi TOP="${SRCROOT}/.." BUILD_BRANDING=$1 +IDENTIFIER=$2 set -x @@ -159,8 +160,7 @@ fi # Add or remove the Keystone keys (only supported in release builds). if [ "${USE_KEYSTONE}" = "1" ] && [ "${CONFIGURATION}" = "Release" ] ; then KEYSTONE_URL="https://tools.google.com/service/update2" - KEYSTONE_APP_ID=$(defaults read "${TMP_INFO_PLIST_DEFAULTS}" \ - CFBundleIdentifier) + KEYSTONE_APP_ID="${IDENTIFIER}" defaults write "${TMP_INFO_PLIST_DEFAULTS}" \ KSVersion -string "${FULL_VERSION}" defaults write "${TMP_INFO_PLIST_DEFAULTS}" KSProductID "${KEYSTONE_APP_ID}" |