Move toolchain update control into src, but keep download logic in depot_tools

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 127 matching lines @@
               '\rRemoving old toolchain in %ds... (Ctrl-C to cancel)' % i)
       sys.stdout.flush()
       time.sleep(1)
     print
 
 
 def main():
   if not sys.platform.startswith(('cygwin', 'win32')):
     return 0
 
-  if len(sys.argv) != 1:
-    print >> sys.stderr, 'Unexpected arguments.'
-    return 1
+  if len(sys.argv) < 2:
+    print >> sys.stderr, 'Usage: get_toolchain_if_necessary.py sha1...'

[iannucci, 2014/02/21 23:53:08]

Probably want to note that we'll get the first sha that we have access to? Or is
it always pro/express?

Either way, the halp message should probably say so :)

Not sure if the module docstring needs to change to reflect this.

+
+  desired_hashes = set(sys.argv[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)))
   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'))
@@ skipping 19 matching lines @@
           '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())