Source major & minor versions from remoting, build & patch versions from Chrome.

remoting/webapp/build-webapp.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.
 
 """Creates a directory with with the unpacked contents of the remoting webapp.
 
 The directory will contain a copy-of or a link-to to all remoting webapp
 resources.  This includes HTML/JS and any plugin binaries. The script also
 massages resulting files appropriately with host plugin data. Finally,
@@ skipping 29 matching lines @@
   zipfile_base = os.path.splitext(os.path.basename(zip_path))[0]
   zip = zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED)
   for (root, dirs, files) in os.walk(directory):
     for f in files:
       full_path = os.path.join(root, f)
       rel_path = os.path.relpath(full_path, directory)
       zip.write(full_path, os.path.join(zipfile_base, rel_path))
   zip.close()
 
 
-def buildWebApp(buildtype, mimetype, destination, zip_path, plugin, files,
-                locales):
+def buildWebApp(buildtype, version, mimetype, destination, zip_path, plugin,
+                files, locales):
   """Does the main work of building the webapp directory and zipfile.
 
   Args:
     buildtype: the type of build ("Official" or "Dev")
     mimetype: A string with mimetype of plugin.
     destination: A string with path to directory where the webapp will be
                  written.
     zipfile: A string with path to the zipfile to create containing the
              contents of |destination|.
     plugin: A string with path to the binary plugin for this webapp.
@@ skipping 86 matching lines @@
   if os.path.isdir(plugin):
     # On Mac we have a directory.
     shutil.copytree(plugin, newPluginPath)
   else:
     shutil.copy2(plugin, newPluginPath)
 
   # Strip the linux build.
   if ((platform.system() == 'Linux') and (buildtype == 'Official')):
     subprocess.call(["strip", newPluginPath])
 
-  # Add unique build numbers to manifest version.
-  # For now, this is based on the system clock (seconds since 1/1/1970), since
-  # a previous attempt (based on build/utils/lastchange.py) was failing on Mac.
-  # TODO(lambroslambrou): Use the SVN revision number or an incrementing build
-  # number (http://crbug.com/90110).
-  timestamp = int(time.time())
-  # Version string must be 1-4 numbers separated by dots, with each number
-  # between 0 and 0xffff.
-  version1 = timestamp / 0x10000
-  version2 = timestamp % 0x10000
+  # Set the version number in the manifest version.
   findAndReplace(os.path.join(destination, 'manifest.json'),
-                 'UNIQUE_VERSION',
-                 '%d.%d' % (version1, version2))
+                 'FULL_APP_VERSION',
+                 version)
 
   # Set the correct mimetype.
   findAndReplace(os.path.join(destination, 'plugin_settings.js'),
                  'HOST_PLUGIN_MIMETYPE',
                  mimetype)
 
   # Set the correct OAuth2 redirect URL.
   baseUrl = (
       'https://talkgadget.google.com/talkgadget/oauth/chrome-remote-desktop')
   if (buildtype == 'Official'):
@@ skipping 24 matching lines @@
                  "'" + apiClientId + "'")
   findAndReplace(os.path.join(destination, 'plugin_settings.js'),
                  "'API_CLIENT_SECRET'",
                  "'" + apiClientSecret + "'")
 
   # Make the zipfile.
   createZip(zip_path, destination)
 
 
 def main():
-  if len(sys.argv) < 6:
+  if len(sys.argv) < 7:
     print ('Usage: build-webapp.py '
-           '<build-type> <mime-type> <dst> <zip-path> <plugin> '
+           '<build-type> <version> <mime-type> <dst> <zip-path> <plugin> '
            '<other files...> --locales <locales...>')
     return 1
 
   reading_locales = False
   files = []
   locales = []
-  for arg in sys.argv[6:]:
+  for arg in sys.argv[7:]:
     if arg == "--locales":
       reading_locales = True;
     elif reading_locales:
       locales.append(arg)
     else:
       files.append(arg)
 
   buildWebApp(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5],
-              files, locales)
+              sys.argv[6], files, locales)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())