Moving version script and gypi file to build\util.

BUG=343792

OK, it's been almost a week now, with regular pings to OWNERs, so I guess it's OK to TBR... It's only Gyp/script changes anyway... Feel free to uncheck the CQ box if you disagree...

TBR=beng@chromium.org, darin@chromium.org

Review URL: https://codereview.chromium.org/165893002

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

23 files changed, 31 insertions, 32 deletions

diff --git a/build/isolate.gypi b/build/isolate.gypi
index c9a15ad..6a84a56 100644
--- a/build/isolate.gypi
+++ b/build/isolate.gypi
@@ -39,7 +39,7 @@
 
 {
   'includes': [
-    '../chrome/version.gypi',
+    '../build/util/version.gypi',
   ],
   'rules': [
     {
diff --git a/build/mac/tweak_info_plist.py b/build/mac/tweak_info_plist.py
index 0f65e4a..3e87b10 100755
--- a/build/mac/tweak_info_plist.py
+++ b/build/mac/tweak_info_plist.py
@@ -76,7 +76,7 @@ def _AddVersionKeys(plist, version=None):
 
   else:
     # Pull in the Chrome version number.
-    VERSION_TOOL = os.path.join(TOP, 'chrome/tools/build/version.py')
+    VERSION_TOOL = os.path.join(TOP, 'build/util/version.py')
     VERSION_FILE = os.path.join(TOP, 'chrome/VERSION')
 
     (stdout, retval1) = _GetOutput([VERSION_TOOL, '-f', VERSION_FILE, '-t',
@@ -114,7 +114,7 @@ def _DoSCMKeys(plist, add_keys):
   scm_revision = None
   if add_keys:
     # Pull in the Chrome revision number.
-    VERSION_TOOL = os.path.join(TOP, 'chrome/tools/build/version.py')
+    VERSION_TOOL = os.path.join(TOP, 'build/util/version.py')
     LASTCHANGE_FILE = os.path.join(TOP, 'build/util/LASTCHANGE')
     (stdout, retval) = _GetOutput([VERSION_TOOL, '-f', LASTCHANGE_FILE, '-t',
                                   '@LASTCHANGE@'])
diff --git a/chrome/version.gypi b/build/util/version.gypi
index f1af6fdc..424871d 100644
--- a/chrome/version.gypi
+++ b/build/util/version.gypi
@@ -1,12 +1,12 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2014 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': {
     'variables': {
-      'version_py_path': '<(DEPTH)/chrome/tools/build/version.py',
-      'version_path': 'VERSION',
+      'version_py_path': '<(DEPTH)/build/util/version.py',
+      'version_path': '<(DEPTH)/chrome/VERSION',
     },
     'version_py_path': '<(version_py_path)',
     'version_path': '<(version_path)',
diff --git a/chrome/tools/build/version.py b/build/util/version.py
index 09604b7..b9ab423 100755
--- a/chrome/tools/build/version.py
+++ b/build/util/version.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Copyright 2014 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.
 
diff --git a/chrome/app/version_assembly/chrome_exe_manifest_action.gypi b/chrome/app/version_assembly/chrome_exe_manifest_action.gypi
index d3ac93b..2f4ce24 100644
--- a/chrome/app/version_assembly/chrome_exe_manifest_action.gypi
+++ b/chrome/app/version_assembly/chrome_exe_manifest_action.gypi
@@ -10,7 +10,7 @@
 #   version_path: string: path to file containing version data (e.g.
 #                 chrome/VERSION).
 #   version_py_path: string: path to file containing version script (e.g.
-#                    chrome/tools/build/version.py).
+#                    build/util/version.py).
 
 {
   'variables': {
diff --git a/chrome/app/version_assembly/version_assembly_manifest_action.gypi b/chrome/app/version_assembly/version_assembly_manifest_action.gypi
index e6756d6..7254b11 100644
--- a/chrome/app/version_assembly/version_assembly_manifest_action.gypi
+++ b/chrome/app/version_assembly/version_assembly_manifest_action.gypi
@@ -11,7 +11,7 @@
 #   version_path: string: path to file containing version data (e.g.
 #                 chrome/VERSION).
 #   version_py_path: string: path to file containing version script (e.g.
-#                    chrome/tools/build/version.py).
+#                    build/util/version.py).
 #   version_full: string: version string in W.X.Y.Z form.
 
 
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index af8baba..9bb2d86 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -90,12 +90,12 @@
     # by Native Client only.
     # NOTE: Most new includes should go in the OS!="ios" condition below.
     '../build/chrome_settings.gypi',
+    '../build/util/version.gypi',
     '../build/win_precompile.gypi',
     'chrome_browser.gypi',
     'chrome_browser_ui.gypi',
     'chrome_common.gypi',
     'chrome_installer_util.gypi',
-    'version.gypi',
     '../components/nacl/nacl_defines.gypi',
   ],
   'conditions': [
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index d90ab6b..ffd0eb5 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -583,9 +583,8 @@
             {
               'action_name': 'posix_version',
               'variables': {
-                'lastchange_path':
-                  '<(DEPTH)/build/util/LASTCHANGE',
-                'version_py_path': 'tools/build/version.py',
+                'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
+                'version_py_path': '<(DEPTH)/build/util/version.py',
                 'version_path': 'VERSION',
                 'template_input_path': 'common/chrome_version_info_posix.h.version',
               },
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index 658db4b..c8477b3 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -309,7 +309,7 @@
               'rule_name': 'setup_version',
               'extension': 'version',
               'variables': {
-                'version_py_path': '../chrome/tools/build/version.py',
+                'version_py_path': '<(DEPTH)/build/util/version.py',
                 'template_input_path': 'installer/setup/setup_exe_version.rc.version',
               },
               'inputs': [
diff --git a/chrome/common_constants.gyp b/chrome/common_constants.gyp
index 5166dad..372d0bd 100644
--- a/chrome/common_constants.gyp
+++ b/chrome/common_constants.gyp
@@ -8,7 +8,7 @@
   },
 
   'includes': [
-    'version.gypi',
+    '../build/util/version.gypi',
   ],
 
   'target_defaults': {
diff --git a/chrome/installer/installer_tools.gyp b/chrome/installer/installer_tools.gyp
index 7af6c48..b9508fd 100644
--- a/chrome/installer/installer_tools.gyp
+++ b/chrome/installer/installer_tools.gyp
@@ -4,7 +4,7 @@
 
 {
   'variables': {
-    'version_py': '<(DEPTH)/chrome/tools/build/version.py',
+    'version_py': '<(DEPTH)/build/util/version.py',
     'version_path': '<(DEPTH)/chrome/VERSION',
     'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
     # 'branding_dir' is set in the 'conditions' section at the bottom.
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index 3352274..bb92eb2 100644
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -1,6 +1,6 @@
 {
   'variables': {
-    'version_py': '../../chrome/tools/build/version.py',
+    'version_py': '<(DEPTH)/build/util/version.py',
     'version_path': '../../chrome/VERSION',
     'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
     # 'branding_dir' is set in the 'conditions' section at the bottom.
diff --git a/chrome/installer/mini_installer_syzygy.gyp b/chrome/installer/mini_installer_syzygy.gyp
index 6c99347..4d19617 100644
--- a/chrome/installer/mini_installer_syzygy.gyp
+++ b/chrome/installer/mini_installer_syzygy.gyp
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 {
   'variables': {
-    'version_py': '<(DEPTH)/chrome/tools/build/version.py',
+    'version_py': '<(DEPTH)/build/util/version.py',
     'version_path': '<(DEPTH)/chrome/VERSION',
     'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
     # 'branding_dir' is set in the 'conditions' section at the bottom.
@@ -14,7 +14,7 @@
     '../../build/win_precompile.gypi',
   ],
   'conditions': [
-    # This target won't build in fastbuild, since there are no PDBs. 
+    # This target won't build in fastbuild, since there are no PDBs.
     ['OS=="win" and fastbuild==0', {
       'conditions': [
         ['chrome_multiple_dll==0', {
diff --git a/chrome/installer/upgrade_test.gyp b/chrome/installer/upgrade_test.gyp
index 82c60da..061604e 100644
--- a/chrome/installer/upgrade_test.gyp
+++ b/chrome/installer/upgrade_test.gyp
@@ -4,7 +4,7 @@
 
 {
   'variables': {
-    'version_py': '../../chrome/tools/build/version.py',
+    'version_py': '<(DEPTH)/build/util/version.py',
     'version_path': '../../chrome/VERSION',
     'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
     # 'branding_dir' is set in the 'conditions' section at the bottom.
diff --git a/chrome/version_resource_rules.gypi b/chrome/version_resource_rules.gypi
index 772d453..afd44e3 100644
--- a/chrome/version_resource_rules.gypi
+++ b/chrome/version_resource_rules.gypi
@@ -9,11 +9,11 @@
 # the required variables:
 #
 #  'includes': [
-#    '<(DEPTH)/chrome/version.gypi',
+#    '<(DEPTH)/build/util/version.gypi',
 #  ],
 #
 # Then include this rule file in a productname_resources target:
-# 
+#
 #    {
 #      'target_name': 'chrome_version_resources',
 #      ...
diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp
index 3db44c6..acf84ce 100644
--- a/chrome_elf/chrome_elf.gyp
+++ b/chrome_elf/chrome_elf.gyp
@@ -6,8 +6,8 @@
     'chromium_code': 1,
   },
   'includes': [
+    '../build/util/version.gypi',
     '../build/win_precompile.gypi',
-    '../chrome/version.gypi',
     'blacklist.gypi',
   ],
   'targets': [
diff --git a/cloud_print/cloud_print_resources.gyp b/cloud_print/cloud_print_resources.gyp
index 1eaaaec..dfa8bc6 100644
--- a/cloud_print/cloud_print_resources.gyp
+++ b/cloud_print/cloud_print_resources.gyp
@@ -6,14 +6,14 @@
     'chromium_code': 1,
 
     'variables': {
-      'version_py_path': '../tools/build/version.py',
+      'version_py_path': '<(DEPTH)/build/util/version.py',
       'version_path': 'VERSION',
     },
     'version_py_path': '<(version_py_path) -f',
     'version_path': '<(version_path)',
   },
   'includes': [
-    '../chrome/version.gypi',
+    '../build/util/version.gypi',
   ],
   'targets': [
     {
@@ -32,7 +32,7 @@
       ],
       'variables': {
         'output_dir': 'cloud_print',
-        'template_input_path': '../chrome/app/chrome_version.rc.version', 
+        'template_input_path': '../chrome/app/chrome_version.rc.version',
         'extra_variable_files_arguments': [ '-f', 'BRANDING' ],
         'extra_variable_files': [ 'BRANDING' ], # NOTE: matches that above
       },
diff --git a/remoting/host/installer/linux/build-deb.sh b/remoting/host/installer/linux/build-deb.sh
index 5c85e56..6f27d46 100755
--- a/remoting/host/installer/linux/build-deb.sh
+++ b/remoting/host/installer/linux/build-deb.sh
@@ -20,7 +20,7 @@ get_version_full() {
   src_root=${src_root:-./../../../..}
   remoting_version_path=$src_root/remoting/VERSION
   chrome_version_path=$src_root/chrome/VERSION
-  version_helper=$src_root/chrome/tools/build/version.py
+  version_helper=$src_root/build/util/version.py
 
   # TODO(lambroslambrou): Refactor to share the logic with remoting.gyp.
   version_major=$($version_helper -f $chrome_version_path \
diff --git a/remoting/remoting_version.gypi b/remoting/remoting_version.gypi
index 2ce1409..6ff247f 100644
--- a/remoting/remoting_version.gypi
+++ b/remoting/remoting_version.gypi
@@ -10,7 +10,7 @@
     # 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_py_path': '../build/util/version.py',
     'remoting_version_path': '../remoting/VERSION',
     'chrome_version_path': '../chrome/VERSION',
     'version_major':
diff --git a/remoting/tools/build/remoting_localize.py b/remoting/tools/build/remoting_localize.py
index 5c4eeb1..466a86e 100755
--- a/remoting/tools/build/remoting_localize.py
+++ b/remoting/tools/build/remoting_localize.py
@@ -656,7 +656,7 @@ def Localize(source, locales, options):
   # Load the localized messages.
   message_map = MessageMap(languages, options.locale_dir)
 
-  # Add OFFICIAL_BUILD variable the same way chrome/tools/build/version.py
+  # Add OFFICIAL_BUILD variable the same way build/util/version.py
   # does.
   if os.environ.get('CHROME_BUILD_TYPE') == '_official':
     context['official_build'] = '1'
diff --git a/webkit/common/user_agent/webkit_user_agent.gyp b/webkit/common/user_agent/webkit_user_agent.gyp
index be4a042..27449b7 100644
--- a/webkit/common/user_agent/webkit_user_agent.gyp
+++ b/webkit/common/user_agent/webkit_user_agent.gyp
@@ -67,7 +67,7 @@
                          '<@(_outputs)',
                        ],
               'variables': {
-                'script': '<(DEPTH)/chrome/tools/build/version.py',
+                'script': '<(DEPTH)/build/util/version.py',
                 'lastchange': '<(DEPTH)/build/util/LASTCHANGE.blink',
                 'template': '<(DEPTH)/webkit/build/webkit_version.h.in',
               },
diff --git a/win8/delegate_execute/delegate_execute.gyp b/win8/delegate_execute/delegate_execute.gyp
index 6230920..a2fa150 100644
--- a/win8/delegate_execute/delegate_execute.gyp
+++ b/win8/delegate_execute/delegate_execute.gyp
@@ -6,8 +6,8 @@
     'chromium_code': 1,
   },
   'includes': [
+    '../../build/util/version.gypi',
     '../../build/win_precompile.gypi',
-    '../../chrome/version.gypi',
   ],
   'targets': [
     {
diff --git a/win8/metro_driver/metro_driver.gyp b/win8/metro_driver/metro_driver.gyp
index 6debc33..42fd9c7 100644
--- a/win8/metro_driver/metro_driver.gyp
+++ b/win8/metro_driver/metro_driver.gyp
@@ -8,8 +8,8 @@
         'chromium_code': 1,
       },
       'includes': [
+        '../../build/util/version.gypi',
         '../../build/win_precompile.gypi',
-        '../../chrome/version.gypi',
       ],
       'target_defaults': {
         # This and the force include below is a workaround for intsafe.h in