Change how version_build_patch is computed to allow PATCH > 255

chrome/tools/build/version.py

 #!/usr/bin/env python
 # Copyright (c) 2009 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.
 
 """
 version.py -- Chromium version string substitution utility.
 """
 
 import getopt
 import os
-import re
-import subprocess
 import sys
 
 
 class Usage(Exception):
   def __init__(self, msg):
     self.msg = msg
 
 
 def fetch_values_from_file(values_dict, file_name):
   """
@@ skipping 79 matching lines @@
     if contents == old_contents:
       return
     os.unlink(file_name)
   open(file_name, 'w').write(contents)
 
 
 def main(argv=None):
   if argv is None:
     argv = sys.argv
 
-  short_options = 'f:i:o:t:h'
-  long_options = ['file=', 'help']
+  short_options = 'e:f:i:o:t:h'
+  long_options = ['eval=', 'file=', 'help']
 
   helpstr = """\
 Usage:  version.py [-h] [-f FILE] ([[-i] FILE] | -t TEMPLATE) [[-o] FILE]
 
   -f FILE, --file=FILE              Read variables from FILE.
   -i FILE, --input=FILE             Read strings to substitute from FILE.
   -o FILE, --output=FILE            Write substituted strings to FILE.
   -t TEMPLATE, --template=TEMPLATE  Use TEMPLATE as the strings to substitute.
+  -e VAR=VAL, --eval=VAR=VAL        Evaluate VAL after reading variables. Can
+                                    be used to synthesize variables. e.g.
+                                    -e 'PATCH_HI=int(PATCH)/256'.
   -h, --help                        Print this help and exit.
 """
 
+  evals = {}
   variable_files = []
   in_file = None
   out_file = None
   template = None
 
   try:
     try:
       opts, args = getopt.getopt(argv[1:], short_options, long_options)
     except getopt.error, msg:
       raise Usage(msg)
     for o, a in opts:
-      if o in ('-f', '--file'):
+      if o in ('-e', '--eval'):
+        try:
+          evals.update(dict([a.split('=',1)]))
+        except ValueError:
+          raise Usage("-e requires VAR=VAL")
+      elif o in ('-f', '--file'):
         variable_files.append(a)
       elif o in ('-i', '--input'):
         in_file = a
       elif o in ('-o', '--output'):
         out_file = a
       elif o in ('-t', '--template'):
         template = a
       elif o in ('-h', '--help'):
         print helpstr
         return 0
     while len(args) and (in_file is None or out_file is None or
                          template is None):
       if in_file is None:
         in_file = args.pop(0)
       elif out_file is None:
         out_file = args.pop(0)
     if args:
       msg = 'Unexpected arguments: %r' % args
       raise Usage(msg)
   except Usage, err:
     sys.stderr.write(err.msg)
-    sys.stderr.write('Use -h to get help.')
+    sys.stderr.write('; Use -h to get help.\n')
     return 2
 
   values = fetch_values(variable_files)
-
+  for key, val in evals.iteritems():
+    values[key] = str(eval(val, globals(), values))
 
   if template is not None:
     contents = subst_template(template, values)
   elif in_file:
     contents = subst_file(in_file, values)
   else:
     # Generate a default set of version information.
     contents = """MAJOR=%(MAJOR)s
 MINOR=%(MINOR)s
 BUILD=%(BUILD)s
 PATCH=%(PATCH)s
 LASTCHANGE=%(LASTCHANGE)s
 OFFICIAL_BUILD=%(OFFICIAL_BUILD)s
 """ % values
 
 
   if out_file:
     write_if_changed(out_file, contents)
   else:
     print contents
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())