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

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,
     # Use consistent strings across all platforms. Note that the plugin name
     # is brand-dependent and is defined further down.
     # Must match host/plugin/constants.h
     'host_plugin_mime_type': 'application/vnd.chromium.remoting-host',
     'host_plugin_description': 'Allow another user to access your computer securely over the Internet.',
 
-    # Borrow the scripts for generating version information for remoting
-    # binaries from Chrome.
-    'variables': {
-      'version_py_path': '../chrome/tools/build/version.py',
-      'version_path': '../remoting/VERSION',
-    },
-    'version_py_path': '<(version_py_path)',
-    'version_path': '<(version_path)',
+    # The version is composed from major & minor versions specific to remoting
+    # and build & patch versions inherited from Chrome.
+    'version_py_path': '../chrome/tools/build/version.py',
+    'version_path': '../remoting/VERSION',
+    'chrome_version_path': '../chrome/VERSION',
     'version_full':
-        '<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@.@MINOR@.@BUILD@.@PATCH@")',
+      '<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@.@MINOR@").'
+      '<!(python <(version_py_path) -f <(chrome_version_path) -t "@BUILD@.@PATCH@")',
 
     'conditions': [
       ['OS=="mac"', {
         'conditions': [
           ['branding=="Chrome"', {
             'mac_bundle_id': 'com.google.Chrome',
             'mac_creator': 'rimZ',
           }, {  # else: branding!="Chrome"
             'mac_bundle_id': 'org.chromium.Chromium',
             'mac_creator': 'Cr24',
@@ skipping 277 matching lines @@
               'AdditionalDependencies': [
                 'wtsapi32.lib',
               ],
             },
           },
         },  # end of target 'remoting_service'
 
         # 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 substiture strings are taken from:
-        #   - remoting/VERSION - the current version of Chromoting.
+        # 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.
         #   - xxx_branding - UI/localizable strings.
         #   - xxx.ver - per-binary non-localizable strings such as the binary
         #     name.
         {
           'target_name': 'remoting_version_resources',
           'type': 'none',
           'dependencies': [
             '../build/util/build_util.gyp:lastchange#target',
           ],
           'inputs': [
             'chromium_branding',
             'google_chrome_branding',
             'version.rc.version',
             '<(DEPTH)/build/util/LASTCHANGE',
             '<(version_path)',
+            '<(chrome_version_path)',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)/remoting',
             ],
           },
           'sources': [
             'host/elevated_controller.ver',
             'host/host_service.ver',
             'host/plugin/host_plugin.ver',
@@ skipping 14 matching lines @@
                   },
                 }, { # else branding!="Chrome"
                   'variables': {
                      'branding_path': 'chromium_branding',
                   },
                 }],
               ],
               'inputs': [
                 '<(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)',
                 '-f', '<(branding_path)',
                 '-f', '<(lastchange_path)',
                 '<(template_input_path)',
                 '<@(_outputs)',
               ],
               'message': 'Generating version information in <@(_outputs)'
             },
           ],
         },  # end of target 'remoting_version_resources'
@@ skipping 222 matching lines @@
 
     {
       'target_name': 'remoting_webapp',
       'type': 'none',
       'dependencies': [
         'remoting_host_plugin',
       ],
       'sources': [
         'webapp/build-webapp.py',
         'webapp/verify-webapp.py',
+        '<(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.
       'actions': [
@@ skipping 30 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)',
+            '<(chrome_version_path)',
             '<@(remoting_webapp_files)',
             '<@(remoting_webapp_locale_files)',
           ],
           'outputs': [
             '<(_output_dir)',
             '<(_zip_path)',
           ],
           'action': [
             'python', 'webapp/build-webapp.py',
             '<(buildtype)',
+            '<(version_full)',
             '<(host_plugin_mime_type)',
             '<(_output_dir)',
             '<(_zip_path)',
             '<(_plugin_path)',
             '<@(remoting_webapp_files)',
             '--locales',
             '<@(remoting_webapp_locale_files)',
           ],
         },
       ],
@@ skipping 691 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }