Run get_toolchain_if_necessary.py with depot_tools Python under Cygwin

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
 you're trying to build an historical version of Chromium from before the
 toolchain upgrade, this will cause you to build with a newer toolchain than
 was available when that code was committed. This is done for a two main
 reasons: 1) it would likely be annoying to have the up-to-date toolchain
 removed and replaced by one without a service pack applied); 2) it would
 require maintaining scripts that can build older not-up-to-date revisions of
 the toolchain. This is likely to be a poorly tested code path that probably
 won't be properly maintained. See http://crbug.com/323300.
 
 This does not extend to major versions of the toolchain however, on the
 assumption that there are more likely to be source incompatibilities between
 major revisions. This script calls a subscript (currently, toolchain2013.py)
 to do the main work. It is expected that toolchain2013.py will always be able
 to acquire/build the most current revision of a VS2013-based toolchain. In the
 future when a hypothetical VS2015 is released, the 2013 script will be
 maintained, and a new 2015 script would be added.
 """
 
-import ctypes.wintypes
 import hashlib
 import json
 import optparse
 import os
 import shutil
 import subprocess
 import sys
 import time
 
 
 BASEDIR = os.path.dirname(os.path.abspath(__file__))
-sys.path.append(os.path.join(BASEDIR, '..'))
+DEPOT_TOOLS_PATH = os.path.join(BASEDIR, '..')
+sys.path.append(DEPOT_TOOLS_PATH)
 import download_from_google_storage
 
-
-GetFileAttributes = ctypes.windll.kernel32.GetFileAttributesW
-GetFileAttributes.argtypes = (ctypes.wintypes.LPWSTR,)
-GetFileAttributes.restype = ctypes.wintypes.DWORD
-FILE_ATTRIBUTE_HIDDEN = 0x2
-FILE_ATTRIBUTE_SYSTEM = 0x4
+if sys.platform != 'cygwin':
+  import ctypes.wintypes
+  GetFileAttributes = ctypes.windll.kernel32.GetFileAttributesW
+  GetFileAttributes.argtypes = (ctypes.wintypes.LPWSTR,)
+  GetFileAttributes.restype = ctypes.wintypes.DWORD
+  FILE_ATTRIBUTE_HIDDEN = 0x2
+  FILE_ATTRIBUTE_SYSTEM = 0x4
 
 
 def IsHidden(file_path):
   """Returns whether the given |file_path| has the 'system' or 'hidden'
   attribute set."""
   p = GetFileAttributes(file_path)
   assert p != 0xffffffff
   return bool(p & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM))
 
 
@@ skipping 127 matching lines @@
 
 def main():
   if not sys.platform.startswith(('cygwin', 'win32')):
     return 0
 
   parser = optparse.OptionParser(description=sys.modules[__name__].__doc__)
   parser.add_option('--output-json', metavar='FILE',
                     help='write information about toolchain to FILE')
   options, args = parser.parse_args()
 
+  if sys.platform == 'cygwin':
+    # This script requires Windows Python, so invoke with depot_tools' Python.
+    def winpath(path):
+      return subprocess.check_output(['cygpath', '-w', path]).strip()
+    python = os.path.join(DEPOT_TOOLS_PATH, 'python.bat')
+    subprocess_command = [python, winpath(__file__)]

[iannucci, 2014/04/11 11:01:33]

nit: `cmd` would be a fine name for this variable, IMHO :)

[Mike Wittman, 2014/04/11 17:58:04]

Done.

+    if options.output_json:
+      subprocess_command.extend(['--output-json', winpath(options.output_json)])
+    subprocess_command.extend(args)
+    p = subprocess.Popen(subprocess_command, shell=False)
+    p.communicate()
+    sys.exit(p.returncode)

[iannucci, 2014/04/11 11:01:33]

this should be

sys.exit(subprocess.call(subprocess_command))

shell=False is the default I think, and there's no need to consume the output of
the nested command... letting it print directly to stdout/stderr is fine.

[Mike Wittman, 2014/04/11 17:58:04]

Done.

+
   # We assume that the Pro hash is the first one.
   desired_hashes = args
   if len(desired_hashes) == 0:
     sys.exit('Desired hashes are required.')
 
   # 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'))
@@ skipping 41 matching lines @@
 
   if options.output_json:
     shutil.copyfile(os.path.join(target_dir, '..', 'data.json'),
                     options.output_json)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())