Automatic toolchain: Use src-internal as signal for Pro

win_toolchain/get_toolchain_if_necessary.py

 #!/usr/bin/env python
 # Copyright 2013 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.
 
 """Downloads and unpacks a toolchain for building on Windows. The contents are
 matched by sha1 which will be updated when the toolchain is updated.
 
 Having a toolchain script in depot_tools means that it's not versioned
 directly with the source code. That is, if the toolchain is upgraded, but
@@ skipping 96 matching lines @@
   next time."""
   file_list = GetFileList(root)
   timestamps_data = {
     'files': [[f, os.stat(f).st_mtime] for f in file_list],
     'sha1': sha1,
   }
   with open(MakeTimestampsFileName(root), 'wb') as f:
     json.dump(timestamps_data, f)
 
 
+def HaveSrcInternalAccess():
+  """Checks whether access to src-internal is available."""
+  with open(os.devnull, 'w') as nul:
+    if subprocess.call(
+        ['svn', 'ls',
+         'svn://svn.chromium.org/chrome-internal/trunk/src-internal/'],
+        shell=True, stdin=nul, stdout=nul, stderr=nul) == 0:
+      return True
+    if subprocess.call(
+        ['git', 'remote', 'show',
+         'https://chrome-internal.googlesource.com/chrome/src-internal/'],
+        shell=True, stdin=nul, stdout=nul, stderr=nul) == 0:
+      return True

[iannucci, 2014/02/04 21:43:58]

nit: this should actually return False. Otherwise it'll return None, which while
Falseish, is confusing :p

+
+
 def main():
   if not sys.platform.startswith(('cygwin', 'win32')):
     return 0
 
   if len(sys.argv) != 1:
     print >> sys.stderr, 'Unexpected arguments.'
     return 1
 
   # Move to depot_tools\win_toolchain where we'll store our files, and where
   # the downloader script is.
   os.chdir(os.path.normpath(os.path.join(BASEDIR)))
-  # TODO(scottmg): http://crbug.com/323300 Attempt to locate a src-internal
-  # pull and use that as a signal to install Pro also.
-  should_get_pro = os.path.isfile(os.path.join(BASEDIR, '.vspro'))
   toolchain_dir = '.'
   target_dir = os.path.normpath(os.path.join(toolchain_dir, 'vs2013_files'))
 
   sha1path = os.path.join(toolchain_dir, 'toolchain_vs2013.hash')
   desired_hashes = set()
   if os.path.isfile(sha1path):
     with open(sha1path, 'rb') as f:
       desired_hashes = set(f.read().strip().splitlines())
 
   # If the current hash doesn't match what we want in the file, nuke and pave.
   # Typically this script is only run when the .sha1 one file is updated, but
   # directly calling "gclient runhooks" will also run it, so we cache
   # based on timestamps to make that case fast.
   current_hash = CalculateHash(target_dir)
   if current_hash not in desired_hashes:
+    should_get_pro = (os.path.isfile(os.path.join(BASEDIR, '.vspro')) or
+                      HaveSrcInternalAccess())
     print('Windows toolchain out of date or doesn\'t exist, updating (%s)...' %
           ('Pro' if should_get_pro else 'Express'))
     # This stays resident and will make the rmdir below fail.
     subprocess.call(['taskkill', '/f', '/im', 'mspdbsrv.exe'])
     if os.path.isdir(target_dir):
       subprocess.check_call('rmdir /s/q "%s"' % target_dir, shell=True)
     args = [sys.executable,
             'toolchain2013.py',
             '--targetdir', target_dir]
     if not should_get_pro:
       args.append('--express')
     subprocess.check_call(args)
     current_hash = CalculateHash(target_dir)
     if current_hash not in desired_hashes:
       print >> sys.stderr, (
           'Got wrong hash after pulling a new toolchain. '
           'Wanted one of \'%s\', got \'%s\'.' % (
               desired_hashes, current_hash))
       return 1
     SaveTimestampsAndHash(target_dir, current_hash)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())