Axe the o3d_version.py script and turn it into a .gypi file. This fixes a bug where bumping the version wasn't always picked up by the build slaves because hooks are only re-run when a GYP file changes.

Also axe the o3d_kill_version.py and the separate SDK version logic, which was not used anymore.

TEST=built on Linux; trybots
BUG=none

Review URL: http://codereview.chromium.org/2017004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46609 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 37 insertions, 43 deletions

diff --git a/o3d/installer/linux/debian.in/debian.gyp b/o3d/installer/linux/debian.in/debian.gyp
index 44506fe..51abeca 100644
--- a/o3d/installer/linux/debian.in/debian.gyp
+++ b/o3d/installer/linux/debian.in/debian.gyp
@@ -5,10 +5,9 @@
 {
   'includes': [
     '../../../build/common.gypi',
+    '../../../plugin/version.gypi',
   ],
   'variables': {
-    'O3D_PLUGIN_VERSION':
-        '<!(python ../../../plugin/version_info.py --version)',
     'INSTALLER_DIR': '<(PRODUCT_DIR)/installer',
     'DEBIAN_DIR': '<(INSTALLER_DIR)/debian',
   },
@@ -57,7 +56,7 @@
           'action': [
             'python',
             'mk_changelog.py',
-            '--version=<(O3D_PLUGIN_VERSION)',
+            '--version=<(plugin_version)',
             '--out=<(DEBIAN_DIR)/changelog',
             '--in=changelog.in',
           ],
@@ -90,10 +89,10 @@
             '-rfakeroot',
           ],
           'outputs': [
-            '<(PRODUCT_DIR)/google-o3d_<(O3D_PLUGIN_VERSION)_<(ARCH).changes',
-            '<(PRODUCT_DIR)/google-o3d_<(O3D_PLUGIN_VERSION)_<(ARCH).deb',
+            '<(PRODUCT_DIR)/google-o3d_<(plugin_version)_<(ARCH).changes',
+            '<(PRODUCT_DIR)/google-o3d_<(plugin_version)_<(ARCH).deb',
             '<(PRODUCT_DIR)/' +
-                'google-o3d-dbgsym_<(O3D_PLUGIN_VERSION)_<(ARCH).deb',
+                'google-o3d-dbgsym_<(plugin_version)_<(ARCH).deb',
           ],
         },
       ],
diff --git a/o3d/installer/mac/installer.gyp b/o3d/installer/mac/installer.gyp
index 10435ce..7e41527 100644
--- a/o3d/installer/mac/installer.gyp
+++ b/o3d/installer/mac/installer.gyp
@@ -5,18 +5,10 @@
 {
   'variables': {
     'chromium_code': 1,
-    'nppversion': '<!(python ../../plugin/version_info.py --commaversion)',
-    'dotnppversion': '<!(python ../../plugin/version_info.py --version)',
-
-    # We don't actually want the extras version to update by itself;
-    # it should change only when we actually add something to the
-    # installer or change the d3dx9 version.  This version is
-    # therefore independent of the o3d plugin and sdk versions.
-    'extrasversion': '0,1,1,0',
-    'dotextrasversion': '0.1.1.0',
   },
   'includes': [
     '../../build/common.gypi',
+    '../../plugin/version.gypi',
   ],
   'targets': [
     {
@@ -35,7 +27,7 @@
             'installer_script_path': './make_installer.sh',
           },
           'postbuild_name': 'Make Installer',
-          'action': ['<(installer_script_path)', '<(dotnppversion)',],
+          'action': ['<(installer_script_path)', '<(plugin_version)',],
         },
       ],
     },
@@ -51,7 +43,7 @@
             'disk_image_script_path': './make_disk_image.sh',
           },
           'postbuild_name': 'Make Disk Image',
-          'action': ['<(disk_image_script_path)', '<(dotnppversion)',],
+          'action': ['<(disk_image_script_path)', '<(plugin_version)',],
         },
       ],
     },
diff --git a/o3d/installer/win/installer.gyp b/o3d/installer/win/installer.gyp
index fa7bca1..9246aa7 100644
--- a/o3d/installer/win/installer.gyp
+++ b/o3d/installer/win/installer.gyp
@@ -9,8 +9,6 @@
     'dx_redist_path': '../../../o3d-internal/third_party/dx_nov_2007_redist',
     'dx_redist_exists': '<!(python ../../build/file_exists.py ../../../o3d-internal/third_party/dx_nov_2007_redist/d3dx9_36.dll)',
     'guidgen': '..\\..\\nbguidgen\\win\\nbguidgen.exe',
-    'nppversion': '<!(python ../../plugin/version_info.py --commaversion)',
-    'dotnppversion': '<!(python ../../plugin/version_info.py --version)',
 
     # Unique guid for o3d namespace
     'o3d_namespace_guid': 'B445DBAE-F5F9-435A-9A9B-088261CDF00A',
@@ -36,6 +34,7 @@
   },
   'includes': [
     '../../build/common.gypi',
+    '../../plugin/version.gypi',
   ],
   'targets': [
     {
@@ -95,10 +94,13 @@
         'candle_exe': '../../../<(wixdir)/candle.exe',
         'light_exe': '../../../<(wixdir)/light.exe',
         'custom_actions_path': '<(PRODUCT_DIR)/cactions.dll',
-        'd3dx_guid': '<!(<(guidgen) <(o3d_namespace_guid) d3dx-<(nppversion))',
+        'd3dx_guid': '<!(<(guidgen) <(o3d_namespace_guid) '
+            'd3dx-<!(python ../../plugin/version_info.py '
+                '--set_version=<(plugin_version) --commaversion))',
         'dbl_path': '../../installer/win/driver_blacklist.txt',
         'dx_redist_guid': '<!(<(guidgen) <(o3d_namespace_guid) '
-                          'dx_redist-<(nppversion))',
+            'dx_redist-<!(python ../../plugin/version_info.py '
+                '--set_version=<(plugin_version) --commaversion))',
         'get_extras_path': '<(PRODUCT_DIR)/getextras.exe',
         'ieplugin_path': '<(PRODUCT_DIR)/o3d_host.dll',
         'include_software_renderer':
@@ -106,26 +108,38 @@
             '../../../<(swiftshaderdir)/swiftshader_d3d9.dll)',
         'npplugin_path': '<(PRODUCT_DIR)/npo3dautoplugin.dll',
         'o3d_driver_blacklist_guid': '<!(<(guidgen) <(o3d_namespace_guid) '
-                                     'o3d_driver_blacklist-<(nppversion))',
+            'o3d_driver_blacklist-<!(python ../../plugin/version_info.py '
+                '--set_version=<(plugin_version) --commaversion))',
         'o3d_get_extras_guid':
             '<!(<(guidgen) <(o3d_namespace_guid) extras_installer-)',
         'o3d_iep_component_guid': '<!(<(guidgen) <(o3d_namespace_guid) '
-                                  'o3d_ieplugin_component-<(nppversion))',
+            'o3d_ieplugin_component-<!(python ../../plugin/version_info.py '
+                '--set_version=<(plugin_version) --commaversion))',
         'o3d_npp_component_guid': '<!(<(guidgen) <(o3d_namespace_guid) '
-                                  'o3d_npplugin_component-<(nppversion))',
+            'o3d_npplugin_component-<!(python ../../plugin/version_info.py '
+                '--set_version=<(plugin_version) --commaversion))',
         'o3d_npp_google_update_reg_component_guid':
             '<!(<(guidgen) <(o3d_namespace_guid) '
-            'o3d_user_google_update_reg_component-<(nppversion))',
-        'o3d_npp_package_guid': '<!(<(guidgen) <(o3d_namespace_guid) o3d_package-<(nppversion))',
-        'o3d_npp_product_guid': '<!(<(guidgen) <(o3d_namespace_guid) o3d_product-<(nppversion))',
+            'o3d_user_google_update_reg_component-'
+            '<!(python ../../plugin/version_info.py '
+                '--set_version=<(plugin_version) --commaversion))',
+        'o3d_npp_package_guid': '<!(<(guidgen) <(o3d_namespace_guid) '
+            'o3d_package-<!(python ../../plugin/version_info.py '
+                '--set_version=<(plugin_version) --commaversion))',
+        'o3d_npp_product_guid': '<!(<(guidgen) <(o3d_namespace_guid) '
+            'o3d_product-<!(python ../../plugin/version_info.py '
+                '--set_version=<(plugin_version) --commaversion))',
         'o3d_npp_reg_key':
             '<(google_update_reg_path)<(o3d_npp_google_update_guid)',
         'o3d_npp_state_reg_key':
             '<(google_update_state_reg_path)<(o3d_npp_google_update_guid)',
         'o3d_reporter_guid':
-            '<!(<(guidgen) <(o3d_namespace_guid) o3d_reporter-<(nppversion))',
+            '<!(<(guidgen) <(o3d_namespace_guid) '
+            'o3d_reporter-<!(python ../../plugin/version_info.py '
+                '--set_version=<(plugin_version) --commaversion))',
         'o3d_software_renderer_guid': '<!(<(guidgen) <(o3d_namespace_guid) '
-                                      'o3d_software_renderer-<(nppversion))',
+            'o3d_software_renderer-<!(python ../../plugin/version_info.py '
+                '--set_version=<(plugin_version) --commaversion))',
         'rep_path': '<(PRODUCT_DIR)/reporter.exe',
         'software_renderer_path':
             '../../../<(swiftshaderdir)/swiftshader_d3d9.dll',
@@ -185,7 +199,7 @@
             '-dNppPackageGuid=<(o3d_npp_package_guid)',
             '-dNppProductGuid=<(o3d_npp_product_guid)',
             '-dNppUpgradeCode=<(o3d_npp_upgrade_code)',
-            '-dNppVersion=<(dotnppversion)',
+            '-dNppVersion=<(plugin_version)',
             '-dRepGuid=<(o3d_reporter_guid)',
             '-dRepPath=<(rep_path)',
             '-dSoftwareRendererGuid=<(o3d_software_renderer_guid)',
@@ -232,7 +246,8 @@
               'candle_exe': '../../../<(wixdir)/candle.exe',
               'light_exe': '../../../<(wixdir)/light.exe',
               'o3d_extras_d3dx_component_guid': '<!(<(guidgen) <(o3d_namespace_guid) '
-              'o3d_extras_d3dx_component-<(nppversion))',
+              'o3d_extras_d3dx_component-<!(python ../../plugin/version_info.py '
+                  '--set_version=<(plugin_version) --commaversion))',
               'o3d_extras_package_guid': '<!(<(guidgen) <(o3d_namespace_guid) '
               'o3d_extras_package-<(extrasversion))',
               'o3d_extras_product_guid': '<!(<(guidgen) <(o3d_namespace_guid) '
diff --git a/o3d/installer/win/o3d_kill_version.py b/o3d/installer/win/o3d_kill_version.py
deleted file mode 100644
index e3eb624..0000000
--- a/o3d/installer/win/o3d_kill_version.py
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/python2.4
-# Copyright 2008 Google Inc. All Rights Reserved.
-
-# version = (major, minor, trunk, patch)
-plugin_version = (0, 2, 0, 0)
-sdk_version = plugin_version
diff --git a/o3d/installer/win/o3d_version.py b/o3d/installer/win/o3d_version.py
deleted file mode 100644
index 11a6c0c..0000000
--- a/o3d/installer/win/o3d_version.py
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/python2.4
-# Copyright 2008-9 Google Inc. All Rights Reserved.
-
-# version = (major, minor, trunk, patch)
-plugin_version = (0, 1, 43, 2)
-sdk_version = plugin_version