diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-23 22:53:18 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-23 22:53:18 +0000 |
| commit | bbf52444adcf0b8d08f36877e938831e5bd82333 (patch) | |
| tree | 8d279c69e8aa5e2c199fd78ee2a3487596219816 /chrome | |
| parent | c4cc7f2b4490831820cbd8461566e5ddb1154c1d (diff) | |
| download | chromium_src-bbf52444adcf0b8d08f36877e938831e5bd82333.zip chromium_src-bbf52444adcf0b8d08f36877e938831e5bd82333.tar.gz chromium_src-bbf52444adcf0b8d08f36877e938831e5bd82333.tar.bz2 | |
Make the Mac Info.plist SCM keys generic
This allows the file_version_info_mac code to make sense for any SCM
(e.g., git). It also aligns the use of FetchVersionInfo to its
documented behavior, which is to return a (branch, revision) tuple
for "some appropriate revision control system".
BUG=None
Review URL: https://chromiumcodereview.appspot.com/10828228
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153101 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome.gyp | 12 | ||||
| -rw-r--r-- | chrome/chrome_dll.gypi | 4 | ||||
| -rw-r--r-- | chrome/chrome_exe.gypi | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 1d65f4a..0ba725a 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -454,14 +454,14 @@ { # Modify the Info.plist as needed. The script explains why this # is needed. This is also done in the chrome and chrome_dll - # targets. In this case, --breakpad=0, --keystone=0, and --svn=0 - # are used because Breakpad, Keystone, and Subversion keys are + # targets. In this case, --breakpad=0, --keystone=0, and --scm=0 + # are used because Breakpad, Keystone, and SCM keys are # never placed into the helper. 'postbuild_name': 'Tweak Info.plist', 'action': ['<(tweak_info_plist_path)', '--breakpad=0', '--keystone=0', - '--svn=0'], + '--scm=0'], }, { # Make sure there isn't any Objective-C in the helper app's @@ -561,14 +561,14 @@ { # Modify the Info.plist as needed. The script explains why this # is needed. This is also done in the chrome and chrome_dll - # targets. In this case, --breakpad=0, --keystone=0, and --svn=0 - # are used because Breakpad, Keystone, and Subversion keys are + # targets. In this case, --breakpad=0, --keystone=0, and --scm=0 + # are used because Breakpad, Keystone, and SCM keys are # never placed into the app mode loader. 'postbuild_name': 'Tweak Info.plist', 'action': ['<(tweak_info_plist_path)', '--breakpad=0', '--keystone=0', - '--svn=0'], + '--scm=0'], }, ], }, # target app_mode_app diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 90e0b86..139b982 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -360,14 +360,14 @@ # The framework needs the Breakpad keys if this feature is # enabled. It does not need the Keystone keys; these always # come from the outer application bundle. The framework - # doesn't currently use the Subversion keys for anything, + # doesn't currently use the SCM keys for anything, # but this seems like a really good place to store them. 'postbuild_name': 'Tweak Info.plist', 'action': ['<(tweak_info_plist_path)', '--breakpad=<(mac_breakpad_compiled_in)', '--breakpad_uploads=<(mac_breakpad_uploads)', '--keystone=0', - '--svn=1', + '--scm=1', '--branding=<(branding)'], }, { diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 39f30b5..9909ed4 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -329,15 +329,15 @@ # Keystone information is included if Keystone is enabled. The # application reads Keystone keys from this plist and not the # framework's, and the ticket will reference this Info.plist to - # determine the tag of the installed product. Use --svn=1 to - # include Subversion information. The --pdf flag controls whether + # determine the tag of the installed product. Use --scm=1 to + # include SCM information. The --pdf flag controls whether # to insert PDF as a supported type identifier that can be # opened. 'postbuild_name': 'Tweak Info.plist', 'action': ['<(tweak_info_plist_path)', '--breakpad=0', '--keystone=<(mac_keystone)', - '--svn=1', + '--scm=1', '--pdf=<(internal_pdf)', '--bundle_id=<(mac_bundle_id)'], }, |