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

remoting/webapp/build-webapp.py

Index: remoting/webapp/build-webapp.py
diff --git a/remoting/webapp/build-webapp.py b/remoting/webapp/build-webapp.py
index 84c962915d9a66fe0ccd01e46a9216a3fd71618e..6f04f897ae57c656cabc970ece94f8d0b7ec680b 100755
--- a/remoting/webapp/build-webapp.py
+++ b/remoting/webapp/build-webapp.py
@@ -47,8 +47,8 @@ def createZip(zip_path, directory):
   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:
@@ -155,19 +155,10 @@ def buildWebApp(buildtype, mimetype, destination, zip_path, plugin, files,
   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'),
@@ -212,16 +203,16 @@ def buildWebApp(buildtype, mimetype, destination, zip_path, plugin, files,
 
 
 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:
@@ -230,7 +221,7 @@ def main():
       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