[Chromoting] Update remoting version numbering pattern

remoting/remoting.gyp

 # 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.
 
 {
   'variables': {
     # TODO(dmaclach): can we pick this up some other way? Right now it's
     # duplicated from chrome.gyp
     'chromium_code': 1,
 
     '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.
+    # Since Chrome's |minor| version is always '0', we replace it with a
+    # Chromoting-specific patch version.
+    # Note that we check both the |chrome_version_path| file and the
+    # |remoting_version_path| so that we can override the Chrome version
+    # numbers if needed.
     '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) -f <(remoting_version_path) -t "@MAJOR@")',
+    'version_minor':
+      '<!(python <(version_py_path) -f <(remoting_version_path) -t "@REMOTING_PATCH@")',
+    'version_short':
+      '<(version_major).<(version_minor).'
+      '<!(python <(version_py_path) -f <(chrome_version_path) -f <(remoting_version_path) -t "@BUILD@")',
     'version_full':
-      '<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@.@MINOR@").'
-      '<!(python <(version_py_path) -f <(chrome_version_path) -t "@BUILD@.@PATCH@")',
-    'version_short':
-      '<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@.@MINOR@").'
-      '<!(python <(version_py_path) -f <(chrome_version_path) -t "@BUILD@")',
+      '<(version_short).'
+      '<!(python <(version_py_path) -f <(chrome_version_path) -f <(remoting_version_path) -t "@PATCH@")',
 
     'branding_path': '../remoting/branding_<(branding)',
     'copyright_info': '<!(python <(version_py_path) -f <(branding_path) -t "@COPYRIGHT@")',
 
     # Use consistent strings across all platforms.
     # These values must match host/plugin/constants.h
     'host_plugin_mime_type': 'application/vnd.chromium.remoting-host',
     'host_plugin_description': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_PLUGIN_DESCRIPTION@")',
     'host_plugin_name': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_PLUGIN_FILE_NAME@")',
 
@@ skipping 298 matching lines @@
                 'PreferencePanes/org.chromium.chromoting.prefPane',
                 'PrivilegedHelperTools/org.chromium.chromoting.me2me_host.app',
                 'Applications/<(host_uninstaller_name).app',
               ],
               'source_files': [
                 '<@(remoting_host_installer_mac_files)',
               ],
               '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)',
                 'HOST_UNINSTALLER_NAME=<(host_uninstaller_name)',
                 'HOST_PKG=<(host_name)',
                 'HOST_SERVICE_PKG=<(host_service_name_nospace)',
                 'HOST_UNINSTALLER_PKG=<(host_uninstaller_name_nospace)',
                 'BUNDLE_ID_HOST=<(bundle_prefix).<(host_name_nospace)',
                 'BUNDLE_ID_HOST_SERVICE=<(bundle_prefix).<(host_service_name_nospace)',
                 'BUNDLE_ID_HOST_UNINSTALLER=<(bundle_prefix).<(host_uninstaller_name_nospace)',
@@ skipping 273 matching lines @@
               'SubSystem': '2',
             },
           },
         },  # end of target 'remoting_daemon'
 
         # Generates the version information resources for the Windows binaries.
         # The .RC files are generated from the "version.rc.version" template and
         # placed in the "<(SHARED_INTERMEDIATE_DIR)/remoting" folder.
         # The substitution strings are taken from:
         #   - build/util/LASTCHANGE - the last source code revision.
-        #   - chrome/VERSION - the build & patch versions.
-        #   - remoting/VERSION - the major & minor versions.
+        #   - chrome/VERSION - the major, build & patch versions.
+        #   - remoting/VERSION - the chromoting patch version (and overrides
+        #       for chrome/VERSION).
         #   - (branding_path) - UI/localizable strings.
         #   - xxx.ver - per-binary non-localizable strings such as the binary
         #     name.
         {
           'target_name': 'remoting_version_resources',
           'type': 'none',
           'inputs': [
             '<(branding_path)',
             'version.rc.version',
             '<(DEPTH)/build/util/LASTCHANGE',
-            '<(version_path)',
+            '<(remoting_version_path)',
             '<(chrome_version_path)',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)/remoting',
             ],
           },
           'sources': [
             'host/plugin/remoting_host_plugin.ver',
             'host/remoting_desktop.ver',
             'host/remoting_host_me2me.ver',
             'host/win/remoting_controller.ver',
             'host/win/remoting_daemon.ver',
           ],
           'rules': [
             {
               'rule_name': 'version',
               'extension': 'ver',
               'variables': {
                 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
                 'template_input_path': 'version.rc.version',
               },
               'inputs': [
+                '<(branding_path)',
+                '<(chrome_version_path)',
+                '<(lastchange_path)',
+                '<(remoting_version_path)',
                 '<(template_input_path)',
-                '<(version_path)',
-                '<(chrome_version_path)',
-                '<(branding_path)',
-                '<(lastchange_path)',
               ],
               'outputs': [
                 '<(SHARED_INTERMEDIATE_DIR)/remoting/<(RULE_INPUT_ROOT)_version.rc',
               ],
               'action': [
                 'python',
                 '<(version_py_path)',
                 '-f', '<(RULE_INPUT_PATH)',
                 '-f', '<(chrome_version_path)',
-                '-f', '<(version_path)',
+                # |remoting_version_path| must be after |chrome_version_path|
+                # because it can contain overrides for the version numbers.
+                '-f', '<(remoting_version_path)',
                 '-f', '<(branding_path)',
                 '-f', '<(lastchange_path)',
                 '<(template_input_path)',
                 '<@(_outputs)',
               ],
               'message': 'Generating version information in <@(_outputs)'
             },
           ],
         },  # end of target 'remoting_version_resources'
       ],  # end of 'targets'
@@ skipping 423 matching lines @@
 
     {
       'target_name': 'remoting_webapp',
       'type': 'none',
       'dependencies': [
         'remoting_host_plugin',
       ],
       'sources': [
         'webapp/build-webapp.py',
         'webapp/verify-webapp.py',
-        '<(version_path)',
+        '<(remoting_version_path)',
         '<(chrome_version_path)',
         '<@(remoting_webapp_files)',
         '<@(remoting_webapp_locale_files)',
       ],
       # Can't use a 'copies' because we need to manipulate
       # the manifest file to get the right plugin name.
       # Also we need to move the plugin into the me2mom
       # folder, which means 2 copies, and gyp doesn't
       # seem to guarantee the ordering of 2 copies statements
       # when the actual project is generated.
@@ skipping 31 matching lines @@
          ],
         },
         {
           'action_name': 'Build Remoting WebApp',
           'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp',
           'plugin_path': '<(PRODUCT_DIR)/<(host_plugin_prefix)remoting_host_plugin.<(host_plugin_extension)',
           'zip_path': '<(PRODUCT_DIR)/remoting-webapp.zip',
           'inputs': [
             'webapp/build-webapp.py',
             '<(_plugin_path)',
-            '<(version_path)',
+            '<(remoting_version_path)',
             '<(chrome_version_path)',
             '<@(remoting_webapp_files)',
             '<@(remoting_webapp_locale_files)',
           ],
           'outputs': [
             '<(_output_dir)',
             '<(_zip_path)',
           ],
           'action': [
             'python', 'webapp/build-webapp.py',
@@ skipping 795 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }