Use full version for breakpad on iOS

build/mac/tweak_info_plist.py

 #!/usr/bin/env python
 
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 #
 # Xcode supports build variable substitutions and CPP; sadly, that doesn't work
 # because:
 #
@@ skipping 109 matching lines @@
 
   # Parse the given version number, that should be in MAJOR.MINOR.BUILD.PATCH
   # format (where each value is a number). Note that str.isdigit() returns
   # True if the string is composed only of digits (and thus match \d+ regexp).
   groups = version.split('.')
   if len(groups) != 4 or not all(element.isdigit() for element in groups):
     print >>sys.stderr, 'Invalid version string specified: "%s"' % version
     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.
   return True
 
 
 def _DoSCMKeys(plist, add_keys):
   """Adds the SCM information, visible in about:version, to property list. If
   |add_keys| is True, it will insert the keys, otherwise it will remove them."""
   scm_revision = None
@@ skipping 16 matching lines @@
 
   return True
 
 
 def _AddBreakpadKeys(plist, branding, platform):
   """Adds the Breakpad keys. This must be called AFTER _AddVersionKeys() and
   also requires the |branding| argument."""
   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'
 
 
 def _RemoveBreakpadKeys(plist):
   """Removes any set Breakpad keys."""
   _RemoveKeys(plist,
       'BreakpadURL',
       'BreakpadReportInterval',
@@ skipping 124 matching lines @@
       # BUILD will always be an increasing value, so BUILD_PATH gives us
       # something unique that meetings what LS wants.
       'CFBundleVersion': '@BUILD@.@PATCH@',
     }
   else:
     version_format_for_key = {
       'CFBundleShortVersionString': '@MAJOR@.@BUILD@.@PATCH@',
       '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 think the use of
'CFBundleShortVersionString' was deliberate there, so maybe there should be a
test for options.platform here:

if options.use_breakpad:
  if option.platform == "mac":
    version_format_for_key['BreakpadVersion'] = \
        version_format_for_key['CFBundleShortVersionString']
  else:
    version_format_for_key['BreakpadVersion'] = \
        version_format_for_key['CFBundleVersion']

[Olivier, 2016/07/08 07:58:02]

On mac, ShortVersion is '@MAJOR@.@MINOR@.@BUILD@.@PATCH@'.
My understanding is that for breakpad, the version should be in this format.
At least, it is at the moment for Windows, Mac and Android.

[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,
       overrides=overrides):
     return 2
 
   # Add Breakpad if configured to do so.
   if options.use_breakpad:
     if options.branding is None:
       print >>sys.stderr, 'Use of Breakpad requires branding.'
@@ skipping 36 matching lines @@
   with tempfile.NamedTemporaryFile() as temp_info_plist:
     plistlib.writePlist(plist, temp_info_plist.name)
 
     # Convert Info.plist to the format requested by the --format flag. Any
     # format would work on Mac but iOS requires specific format.
     return _ConvertPlist(temp_info_plist.name, output_path, options.format)
 
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv[1:]))