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

win_toolchain/get_toolchain_if_necessary.py

Index: win_toolchain/get_toolchain_if_necessary.py
diff --git a/win_toolchain/get_toolchain_if_necessary.py b/win_toolchain/get_toolchain_if_necessary.py
index 3ac6689c695f654f9cc2e151db969b86287c7b2c..9727c1f244df918e7a70252b83c65dbc86a5364a 100755
--- a/win_toolchain/get_toolchain_if_necessary.py
+++ b/win_toolchain/get_toolchain_if_necessary.py
@@ -145,9 +145,10 @@ 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.
@@ -155,12 +156,6 @@ def main():
   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