[Chromoting] Update remoting version numbering pattern

remoting/remoting.gyp

Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index d23e7d12a352224cb7de3164c3ac74d0be93f6df..77228a05d3be6e54cc5836ada5896a815bc12dda 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -11,16 +11,21 @@
     'remoting_host_linux_clipboard%': 1,
     'remoting_multi_process%': 0,
 
-    # The version is composed from major & minor versions specific to remoting
-    # and build & patch versions inherited from Chrome.
+    # The major, build and patch versions are inherited from Chrome.
+    # The minor version is specific to remoting - it is usually '0', but may
+    # be incremented when we need to push updates for the same major version.
     'version_py_path': '../chrome/tools/build/version.py',
-    'version_path': '../remoting/VERSION',
+    'remoting_version_path': '../remoting/VERSION',
     'chrome_version_path': '../chrome/VERSION',
+    'version_major':
+      '<!(python <(version_py_path) -f <(chrome_version_path) -t "@MAJOR@")',
+    'version_minor':
+      '<!(python <(version_py_path) -f <(remoting_version_path) -t "@MINOR@")',
     'version_full':
-      '<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@.@MINOR@").'
+      '<(version_major).<(version_minor).'
       '<!(python <(version_py_path) -f <(chrome_version_path) -t "@BUILD@.@PATCH@")',

[Wez, 2012/10/05 00:56:43]

nit: Pull out version_build to make these two more readable.

     'version_short':
-      '<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@.@MINOR@").'
+      '<(version_major).<(version_minor).'
       '<!(python <(version_py_path) -f <(chrome_version_path) -t "@BUILD@")',
 
     'branding_path': '../remoting/branding_<(branding)',
@@ -340,8 +345,8 @@
               'defs': [
                 'VERSION=<(version_full)',
                 'VERSION_SHORT=<(version_short)',
-                'VERSION_MAJOR=<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@")',
-                'VERSION_MINOR=<!(python <(version_py_path) -f <(version_path) -t "@MINOR@")',
+                'VERSION_MAJOR=<(version_major)',
+                'VERSION_MINOR=<(version_minor)',
                 'COPYRIGHT_INFO=<(copyright_info)',
                 'HOST_NAME=<(host_name)',
                 'HOST_SERVICE_NAME=<(host_service_name)',
@@ -647,7 +652,7 @@
             '<(branding_path)',
             'version.rc.version',
             '<(DEPTH)/build/util/LASTCHANGE',
-            '<(version_path)',
+            '<(remoting_version_path)',
             '<(chrome_version_path)',
           ],
           'direct_dependent_settings': {
@@ -672,7 +677,7 @@
               },
               'inputs': [
                 '<(template_input_path)',
-                '<(version_path)',
+                '<(remoting_version_path)',
                 '<(chrome_version_path)',
                 '<(branding_path)',
                 '<(lastchange_path)',
@@ -685,7 +690,7 @@
                 '<(version_py_path)',
                 '-f', '<(RULE_INPUT_PATH)',
                 '-f', '<(chrome_version_path)',
-                '-f', '<(version_path)',
+                '-f', '<(remoting_version_path)',
                 '-f', '<(branding_path)',
                 '-f', '<(lastchange_path)',
                 '<(template_input_path)',
@@ -1127,7 +1132,7 @@
       'sources': [
         'webapp/build-webapp.py',
         'webapp/verify-webapp.py',
-        '<(version_path)',
+        '<(remoting_version_path)',
         '<(chrome_version_path)',
         '<@(remoting_webapp_files)',
         '<@(remoting_webapp_locale_files)',
@@ -1179,7 +1184,7 @@
           'inputs': [
             'webapp/build-webapp.py',
             '<(_plugin_path)',
-            '<(version_path)',
+            '<(remoting_version_path)',
             '<(chrome_version_path)',
             '<@(remoting_webapp_files)',
             '<@(remoting_webapp_locale_files)',