Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(821)

Unified Diff: build/mac/tweak_info_plist.py

Issue 2132913003: Use full version for breakpad on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/mac/tweak_info_plist.py
diff --git a/build/mac/tweak_info_plist.py b/build/mac/tweak_info_plist.py
index 6c3f34ba1ec18908f1c053b178bd5c097c603a26..23c810aaeccc1a1cb5b94070aed8d98670131d98 100755
--- a/build/mac/tweak_info_plist.py
+++ b/build/mac/tweak_info_plist.py
@@ -127,7 +127,7 @@ def _AddVersionKeys(
return False
values = dict(zip(('MAJOR', 'MINOR', 'BUILD', 'PATCH'), groups))
- for key in ('CFBundleVersion', 'CFBundleShortVersionString'):
+ for key in version_format_for_key:
plist[key] = _GetVersion(version_format_for_key[key], values, overrides)
# Return with no error.
@@ -164,7 +164,6 @@ def _AddBreakpadKeys(plist, branding, platform):
plist['BreakpadReportInterval'] = '3600' # Deliberately a string.
plist['BreakpadProduct'] = '%s_%s' % (branding, platform)
plist['BreakpadProductDisplay'] = branding
- plist['BreakpadVersion'] = plist['CFBundleShortVersionString']
# These are both deliberately strings and not boolean.
plist['BreakpadSendAndExit'] = 'YES'
plist['BreakpadSkipConfirm'] = 'YES'
@@ -309,6 +308,10 @@ def Main(argv):
'CFBundleVersion': '@MAJOR@.@MINOR@.@BUILD@.@PATCH@'
}
+ if options.use_breakpad:
+ version_format_for_key['BreakpadVersion'] = \
sdefresne 2016/07/08 07:50:41 Are you sure we also want to do this on mac? I thi
Olivier 2016/07/08 07:58:02 On mac, ShortVersion is '@MAJOR@.@MINOR@.@BUILD@.@
sdefresne 2016/07/08 08:00:46 Ack.
rohitrao (ping after 24h) 2016/07/08 10:41:05 Let's have Mark take a look to be sure.
+ '@MAJOR@.@MINOR@.@BUILD@.@PATCH@'
+
# Insert the product version.
if not _AddVersionKeys(
plist, version_format_for_key, version=options.version,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698