Detect cygwin as Win32 for the purposes of running GN and downloading from google storage.

download_from_google_storage.py

 #!/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.
 
 """Download files from Google Storage based on SHA1 sums."""
 
 
 import hashlib
 import optparse
@@ skipping 14 matching lines @@
 
 
 class FileNotFoundError(IOError):
   pass
 
 
 class InvalidFileError(IOError):
   pass
 
 
+def GetNormalizedPlatform():
+  """Returns the result of sys.platform accounting for cygwin.
+  Under cygwin, this will always return "win32" like the native Python."""
+  if sys.platform == "cygwin":

[M-A Ruel, 2013/12/05 14:37:58]

prefer single quotes to double quotes for strings.

+    return "win32"
+  return sys.platform
+
+
 # Common utilities
 class Gsutil(object):
   """Call gsutil with some predefined settings.  This is a convenience object,
   and is also immutable."""
   def __init__(self, path, boto_path, timeout=None):
     if not os.path.exists(path):
       raise FileNotFoundError('GSUtil not found in %s' % path)
     self.path = path
     self.timeout = timeout
     self.boto_path = boto_path
@@ skipping 145 matching lines @@
     if code != 0:
       out_q.put('%d> %s' % (thread_num, err))
       ret_codes.put((code, err))
 
     # Mark executable if necessary. We key off of the custom header
     # "x-goog-meta-executable".
     #
     # TODO(hinoka): It is supposedly faster to use "gsutil stat" but that
     # doesn't appear to be supported by the gsutil currently in our tree. When
     # we update, this code should use that instead of "gsutil ls -L".
     if not sys.platform.startswith('win'):

[brettw, 2013/12/05 06:11:19]

I considered changing this place as well, but I can't tell what the right
behavior is. I don't think it actually matters (we might run chmod on cygwin,
but that should be OK).

[M-A Ruel, 2013/12/05 14:37:58]

Once upon a time, someone decided to put sys.platform as 'win64' on x64 builds.
This was fixed in 2000 because it broke so many things. So 'win32' is hardcoded
for life. There's no reason to use the sys.platform.startswith('win') form
anymore, this code is either very old or very copy pasted.

From now on, use
sys.platform == 'win32'

Refs:
https://mail.python.org/pipermail/patches/2000-May/000648.html
http://hg.python.org/cpython/rev/0a3081de55a1

       code, out, _ = gsutil.check_call('ls', '-L', file_url)
       if code != 0:
         out_q.put('%d> %s' % (thread_num, err))
         ret_codes.put((code, err))
       elif re.search('x-goog-meta-executable:', out):
         st = os.stat(output_filename)
         os.chmod(output_filename, st.st_mode | stat.S_IEXEC)
 
 def printer_worker(output_queue):
   while True:
@@ skipping 99 matching lines @@
                     help='A regular expression that is compared against '
                          'Python\'s sys.platform. If this option is specified, '
                          'the download will happen only if there is a match.')
   parser.add_option('-v', '--verbose', action='store_true',
                     help='Output extra diagnostic and progress information.')
 
   (options, args) = parser.parse_args()
 
   # Make sure we should run at all based on platform matching.
   if options.platform:
-    if not re.match(options.platform, sys.platform):
+    if not re.match(options.platform, GetNormalizedPlatform()):
       if options.verbose:
         print('The current platform doesn\'t match "%s", skipping.' %
               options.platform)
       return 0
 
   # Set the boto file to /dev/null if we don't need auth.
   if options.no_auth:
     options.boto = os.devnull
 
   # Make sure we can find a working instance of gsutil.
@@ skipping 55 matching lines @@
     return code
 
   return download_from_google_storage(
       input_filename, base_url, gsutil, options.num_threads, options.directory,
       options.recursive, options.force, options.output, options.ignore_errors,
       options.sha1_file, options.verbose)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))