ninja windows: fix expansion of some VS macros

pylib/gyp/msvs_emulation.py

 # Copyright (c) 2012 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.
 
 """
 This module helps emulate Visual Studio 2008 behavior on top of other
 build systems, primarily ninja.
 """
 
 import os
@@ skipping 290 matching lines @@
     """Returns the flags that need to be added to link commands."""
     ldflags = []
     ld = self._GetWrapper(self, self.msvs_settings[config],
                           'VCLinkerTool', append=ldflags)
     self._GetDefFileAsLdflags(self.spec, ldflags, gyp_to_build_path)
     ld('GenerateDebugInformation', map={'true': '/DEBUG'})
     ld('TargetMachine', map={'1': 'X86', '17': 'X64'}, prefix='/MACHINE:')
     ldflags.extend(self._GetAdditionalLibraryDirectories(
         'VCLinkerTool', config, gyp_to_build_path))
     ld('DelayLoadDLLs', prefix='/DELAYLOAD:')
-    out = self._Setting(('VCLinkerTool', 'OutputFile'), config, prefix='/OUT:')
+    out = self._Setting(('VCLinkerTool', 'OutputFile'), config)
     if out:
-      ldflags.append(self.ConvertVSMacros(out))
+      ldflags.append('/OUT:' + gyp_to_build_path(self.ConvertVSMacros(out)))
     ld('AdditionalOptions', prefix='')
     ld('SubSystem', map={'1': 'CONSOLE', '2': 'WINDOWS'}, prefix='/SUBSYSTEM:')
     ld('LinkIncremental', map={'1': ':NO', '2': ''}, prefix='/INCREMENTAL')
     ld('FixedBaseAddress', map={'1': ':NO', '2': ''}, prefix='/FIXED')
     ld('RandomizedBaseAddress',
         map={'1': ':NO', '2': ''}, prefix='/DYNAMICBASE')
     ld('DataExecutionPrevention',
         map={'1': ':NO', '2': ''}, prefix='/NXCOMPAT')
     ld('OptimizeReferences', map={'1': 'NOREF', '2': 'REF'}, prefix='/OPT:')
     ld('EnableCOMDATFolding', map={'1': 'NOICF', '2': 'ICF'}, prefix='/OPT:')
@@ skipping 80 matching lines @@
     midl_get = self._GetWrapper(self, self.msvs_settings[config], 'VCMIDLTool')
     def midl(name, default=None):
       return self.ConvertVSMacros(midl_get(name, default=default))
     tlb = midl('TypeLibraryName', default='${root}.tlb')
     header = midl('HeaderFileName', default='${root}.h')
     dlldata = midl('DLLDataFileName', default='dlldata.c')
     iid = midl('InterfaceIdentifierFileName', default='${root}_i.c')
     proxy = midl('ProxyFileName', default='${root}_p.c')
     # Note that .tlb is not included in the outputs as it is not always
     # generated depending on the content of the input idl file.
-    outdir = midl('OutputDirectory')
+    outdir = midl('OutputDirectory', '')
     output = [header, dlldata, iid, proxy]
     variables = [('tlb', tlb),
                  ('h', header),
                  ('dlldata', dlldata),
                  ('iid', iid),
                  ('proxy', proxy)]
     # TODO(scottmg): Are there configuration settings to set these flags?
     flags = ['/char', 'signed', '/env', 'win32', '/Oicf']
     return outdir, output, variables, flags
 
 vs_version = None
 def GetVSVersion(generator_flags):
   global vs_version
   if not vs_version:
     vs_version = gyp.MSVSVersion.SelectVisualStudioVersion(
         generator_flags.get('msvs_version', 'auto'))
   return vs_version
 
 def _GetBinaryPath(generator_flags, tool):
   vs = GetVSVersion(generator_flags)
   return ('"' +
-          os.path.normpath(os.path.join(vs.Path(), "VC/bin", tool)) +
+          os.path.normpath(os.path.join(vs.Path(), "VC/bin", tool)).lower() +
           '"')
 
 def GetCLPath(generator_flags):
   return _GetBinaryPath(generator_flags, 'cl.exe')
 
 def GetLinkPath(generator_flags):
   return _GetBinaryPath(generator_flags, 'link.exe')
 
 def GetLibPath(generator_flags):
   return _GetBinaryPath(generator_flags, 'lib.exe')
@@ skipping 21 matching lines @@
         vs.Path(), r'Common7\Tools\vsvars32.bat'))
 
 def ExpandMacros(string, expansions):
   """Expand $(Variable) per expansions dict. See MsvsSettings.GetVSMacroEnv
   for the canonical way to retrieve a suitable dict."""
   if '$' in string:
     for old, new in expansions.iteritems():
       assert '$(' not in new, new
       string = string.replace(old, new)
   return string