Fully qualify path to cl.exe for ninja windows, and support *_wrapper from environment

pylib/gyp/generator/ninja.py

 # Copyright (c) 2013 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import copy
 import hashlib
 import multiprocessing
 import os.path
 import re
 import signal
@@ skipping 352 matching lines @@
 
     self.is_mac_bundle = gyp.xcode_emulation.IsMacBundle(self.flavor, spec)
     self.xcode_settings = self.msvs_settings = None
     if self.flavor == 'mac':
       self.xcode_settings = gyp.xcode_emulation.XcodeSettings(spec)
     if self.flavor == 'win':
       self.msvs_settings = gyp.msvs_emulation.MsvsSettings(spec,
                                                            generator_flags)
       arch = self.msvs_settings.GetArch(config_name)
       self.ninja.variable('arch', self.win_env[arch])
+      self.ninja.variable('cc', '$cl_' + arch)
+      self.ninja.variable('cxx', '$cl_' + arch)
 
     # Compute predepends for all rules.
     # actions_depends is the dependencies this target depends on before running
     # any of its action/rule/copy steps.
     # compile_depends is the dependencies this target depends on before running
     # any of its compile steps.
     actions_depends = []
     compile_depends = []
     # TODO(evan): it is rather confusing which things are lists and which
     # are strings.  Fix these.
@@ skipping 977 matching lines @@
   gyp.common.CopyTool(flavor, toplevel_build)
 
   # Grab make settings for CC/CXX.
   # The rules are
   # - The priority from low to high is gcc/g++, the 'make_global_settings' in
   #   gyp, the environment variable.
   # - If there is no 'make_global_settings' for CC.host/CXX.host or
   #   'CC_host'/'CXX_host' enviroment variable, cc_host/cxx_host should be set
   #   to cc/cxx.
   if flavor == 'win':
-    cc = 'cl.exe'
-    cxx = 'cl.exe'
+    cc = 'UNKNOWN'  # Must be overridden by local arch choice.
+    cxx = 'UNKNOWN'
     ld = 'link.exe'
-    gyp.msvs_emulation.GenerateEnvironmentFiles(
-        toplevel_build, generator_flags, OpenOutput)
     ld_host = '$ld'
   else:
     cc = 'gcc'
     cxx = 'g++'
     ld = '$cxx'
     ld_host = '$cxx_host'
 
   cc_host = None
   cxx_host = None
   cc_host_global_setting = None
@@ skipping 20 matching lines @@
       cc_host = os.path.join(build_to_root, value)
       cc_host_global_setting = value
     if key == 'CXX.host':
       cxx_host = os.path.join(build_to_root, value)
       cxx_host_global_setting = value
     if key == 'LD.host':
       ld_host = os.path.join(build_to_root, value)
     if key.endswith('_wrapper'):
       wrappers[key[:-len('_wrapper')]] = os.path.join(build_to_root, value)
 
+  # Support wrappers from environment variables too.
+  for key, value in os.environ.iteritems():
+    if key.endswith('_wrapper'):

[Reid Kleckner, 2013/05/08 18:55:42]

This doesn't seem to work for me, because Python stores the env var keys as all
uppercase, leading this comparison to always fail.  :(

Adding .lower() before .endswith might work.

Also, before this change (I think?) setting CC directly used to work.

[scottmg, 2013/05/08 19:23:33]

Sorry. Are you using cygwin Python perhaps?

+      wrappers[key[:-len('_wrapper')]] = os.path.join(build_to_root, value)
+
+  cl_paths = gyp.msvs_emulation.GenerateEnvironmentFiles(
+      toplevel_build, generator_flags, OpenOutput)
+  for arch, path in cl_paths.iteritems():
+    master_ninja.variable('cl_' + arch,
+                          CommandWithWrapper('CC', wrappers, path))
+
   cc = GetEnvironFallback(['CC_target', 'CC'], cc)
   master_ninja.variable('cc', CommandWithWrapper('CC', wrappers, cc))
   cxx = GetEnvironFallback(['CXX_target', 'CXX'], cxx)
   master_ninja.variable('cxx', CommandWithWrapper('CXX', wrappers, cxx))
   ld = GetEnvironFallback(['LD_target', 'LD'], ld)
 
   if not cc_host:
     cc_host = cc
   if not cxx_host:
     cxx_host = cxx
 
   if flavor == 'win':
     master_ninja.variable('ld', ld)
     master_ninja.variable('idl', 'midl.exe')
     master_ninja.variable('ar', 'lib.exe')
     master_ninja.variable('rc', 'rc.exe')
     master_ninja.variable('asm', 'ml.exe')
     master_ninja.variable('mt', 'mt.exe')
-    master_ninja.variable('use_dep_database', '1')
   else:
     master_ninja.variable('ld', CommandWithWrapper('LINK', wrappers, ld))
     master_ninja.variable('ar', GetEnvironFallback(['AR_target', 'AR'], 'ar'))
 
   master_ninja.variable('ar_host', GetEnvironFallback(['AR_host'], 'ar'))
   cc_host = GetEnvironFallback(['CC_host'], cc_host)
   cxx_host = GetEnvironFallback(['CXX_host'], cxx_host)
   ld_host = GetEnvironFallback(['LD_host'], ld_host)
 
   # The environment variable could be used in 'make_global_settings', like
@@ skipping 367 matching lines @@
           arglists.append(
               (target_list, target_dicts, data, params, config_name))
           pool.map(CallGenerateOutputForConfig, arglists)
       except KeyboardInterrupt, e:
         pool.terminate()
         raise e
     else:
       for config_name in config_names:
         GenerateOutputForConfig(target_list, target_dicts, data, params,
                                 config_name)