- Set the bundle name based on the executable name (since they both are the branding).

- Stop using CPP on the info.plist since we have to run a script anyways.
- Set the bundleid into a build setting for simple info.plist processing to pick up.
- Add a script for the chrome/app target to manually tweak the info.plist:
  - collect the version number from the build tree
  - collect the svn revision from the build tree
  - update the info.plist keys that need the version number based on collected data.
  - record the svn revision into the info.plist for trouble shooting.
Review URL: http://codereview.chromium.org/115187

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15778 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 21 insertions, 8 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 62bb9ac..43d4676 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1936,14 +1936,10 @@
             }],
           ],
           'xcode_settings': {
-            # chrome/app/app-Info.plist has a CFBundleIdentifier of BUNDLE_ID,
-            # to be replaced by a properly branded bundle ID in Xcode with
-            # these settings.
-            'INFOPLIST_PREPROCESS': 'YES',
-            'INFOPLIST_PREPROCESSOR_DEFINITIONS': [
-              'BUNDLE_ID="<(bundle_id)"',
-              'BUNDLE_NAME="<(branding)"'
-            ],
+            # chrome/app/app-Info.plist has a CFBundleIdentifier of
+            # CHROMIUM_BUNDLE_ID to be replaced by a branded bundle ID in Xcode
+            # with this settings.
+            'CHROMIUM_BUNDLE_ID': '<(bundle_id)',
           },
         }, { # else: OS != "mac"
           'conditions': [
@@ -1958,6 +1954,23 @@
             }],
           ],
         }],
+        ['OS=="mac"', {
+          # Mac addes an action to modify the Info.plist to meet our needs
+          # (see the script for why this is done).
+          'actions': [
+            {
+              'action_name': 'tweak_app_infoplist',
+              # We don't list any inputs or outputs because we always want
+              # the script to run.  Why?  Because it does thinks like record
+              # the svn revision into the info.plist, so there is no file to
+              # depend on that will change when ever that changes.
+              'inputs': [],
+              'outputs': [],
+              'action': ['<(DEPTH)/build/mac/tweak_app_infoplist',
+                         '<(branding)'],
+            },
+          ],
+        }],
         ['OS=="win"', {
           'include_dirs': [
             'third_party/wtl/include',