Move control of updating toolchain into src/

build/gyp_chromium

 #!/usr/bin/env python
 
 # 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.
 
 # This script is wrapper for Chromium that adds some support for how GYP
 # is invoked by Chromium beyond what can be done in the gclient hooks.
 
 import glob
@@ skipping 312 matching lines @@
   # Need to pass both the source root (the bots don't run this command from
   # within the source tree) as well as set the is_gyp value so the BUILD files
   # to know they're being run under GYP.
   args = [gnpath, 'gyp', '-q',
           '--root=' + chrome_src,
           '--args=' + GetArgsStringForGN(vars_dict),
           '--output=//' + GetOutputDirectory() + '/gn_build/']
   return subprocess.call(args) == 0
 
 
+def GetDesiredVsToolchainHashes():
+  """Load a list of SHA1s corresponding to the toolchains that we want installed
+  to build with."""
+  sha1path = os.path.join(script_dir, 'toolchain_vs2013.hash')
+  with open(sha1path, 'rb') as f:
+    return f.read().strip().splitlines()
+
+
 def CopyVsRuntimeDlls(output_dir, runtime_dirs):
   """Copies the VS runtime DLLs from the given |runtime_dirs| to the output
   directory so that even if not system-installed, built binaries are likely to
   be able to run.
 
   This needs to be run after gyp has been run so that the expected target
   output directories are already created.
   """
   assert sys.platform.startswith(('win32', 'cygwin'))
 
@@ skipping 88 matching lines @@
   # . set the env var only if it hasn't been set yet
   # . chromium.gyp_env has been applied to os.environ at this point already
   if sys.platform.startswith('linux') and not os.environ.get('GYP_GENERATORS'):
     os.environ['GYP_GENERATORS'] = 'ninja'
   if sys.platform.startswith('win') and not os.environ.get('GYP_GENERATORS'):
     os.environ['GYP_GENERATORS'] = 'ninja'
   elif sys.platform == 'darwin' and not os.environ.get('GYP_GENERATORS') and \
       not 'OS=ios' in os.environ.get('GYP_DEFINES', []):
     os.environ['GYP_GENERATORS'] = 'ninja'
 
-  # If on windows, and the automatic toolchain has been installed by
-  # depot_tools, then use it.
+  # If on Windows, request that depot_tools install/update the automatic
+  # toolchain, and then use it (unless opted-out).
   vs2013_runtime_dll_dirs = None
-  # If MSVS_VERSION is explicitly specified to be something other than 2013,
-  # don't use the automatic toolchain, as it currently only supports VS2013.
-  msvs_version = os.environ.get('GYP_MSVS_VERSION', '2013')
-  if sys.platform in ('win32', 'cygwin') and msvs_version.startswith('2013'):
+  depot_tools_win_toolchain = \
+      bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1')))
+  if sys.platform in ('win32', 'cygwin') and depot_tools_win_toolchain:
     import find_depot_tools
     depot_tools_path = find_depot_tools.add_depot_tools_to_path()
+    get_toolchain_args = [
+        sys.executable,
+        os.path.join(depot_tools_path,
+                     'win_toolchain',
+                     'get_toolchain_if_necessary.py'),
+    ]
+    get_toolchain_args.extend(GetDesiredVsToolchainHashes())

[iannucci, 2014/02/21 23:56:14]

the + operator works too :P

[scottmg, 2014/02/22 00:10:43]

maruel always asks for + -> extend/append. Geez, Code Reviews! 9_9

+    subprocess.check_call(get_toolchain_args)
+
+    # TODO(scottmg): This should point at vs2013_files/<sha1> so that we can
+    # have multiple versions concurrently. This is slightly complicated at the
+    # moment because the downloader script doesn't know the SHA1 of the
+    # toolchain that it's downloading, so only supports having one 'installed'
+    # at a time.

[iannucci, 2014/02/21 23:56:14]

We should probably have the depot tools thing print out the path to the
installed tools, or, better, the path to the batch file / json file with the env
vars.

[scottmg, 2014/02/22 00:10:43]

This seems better, except it's a somewhat long process, so I'd like to have it
send some output to stdout for the user's benefit. It could write a file ...
somewhere?

     toolchain = os.path.normpath(os.path.join(
         depot_tools_path, 'win_toolchain', 'vs2013_files'))
     version_file = os.path.join(toolchain, '.version')
     if os.path.isdir(toolchain) and os.path.isfile(version_file):
       os.environ['GYP_MSVS_OVERRIDE_PATH'] = toolchain
       with open(version_file, 'r') as f:
         version_is_pro = f.read().strip() == 'pro'
       vs2013_runtime_dll_dirs = (os.path.join(toolchain, 'sys32'),
                                  os.path.join(toolchain, 'sys64'))
       os.environ['GYP_MSVS_VERSION'] = '2013' if version_is_pro else '2013e'
@@ skipping 50 matching lines @@
   # from above are picked up.
   print 'Running build/landmines.py...'
   subprocess.check_call(
       [sys.executable, os.path.join(script_dir, 'landmines.py')])
 
   if vs2013_runtime_dll_dirs:
     CopyVsRuntimeDlls(os.path.join(chrome_src, GetOutputDirectory()),
                       vs2013_runtime_dll_dirs)
 
   sys.exit(gyp_rc)