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 202 matching lines @@
     on other VS settings."""
     defines = []
     if self._ConfigAttrib(['CharacterSet'], config) == '1':
       defines.extend(('_UNICODE', 'UNICODE'))
     if self._ConfigAttrib(['CharacterSet'], config) == '2':
       defines.append('_MBCS')
     defines.extend(self._Setting(
         ('VCCLCompilerTool', 'PreprocessorDefinitions'), config, default=[]))
     return defines
 
-  def GetOutputName(self, spec, config):
+  def GetOutputName(self, config, expand_special):
     """Gets the explicitly overridden output name for a target or returns None
     if it's not overridden."""
-    type = spec['type']
+    type = self.spec['type']
     root = 'VCLibrarianTool' if type == 'static_library' else 'VCLinkerTool'
     # TODO(scottmg): Handle OutputDirectory without OutputFile.
     output_file = self._Setting((root, 'OutputFile'), config)
     if output_file:
-      output_file = os.path.normpath(self.ConvertVSMacros(output_file))
+      output_file = expand_special(self.ConvertVSMacros(output_file))
     return output_file
 
   def GetCflags(self, config):
     """Returns the flags that need to be added to .c and .cc compilations."""
     cflags = []
     cflags.extend(['/wd' + w for w in self.msvs_disabled_warnings[config]])
     cl = self._GetWrapper(self, self.msvs_settings[config],
                           'VCCLCompilerTool', append=cflags)
     cl('Optimization', map={'0': 'd', '2': 's'}, prefix='/O')
     cl('InlineFunctionExpansion', prefix='/Ob')
@@ skipping 48 matching lines @@
     """.def files get implicitly converted to a ModuleDefinitionFile for the
     linker in the VS generator. Emulate that behaviour here."""
     def_file = ''
     if spec['type'] in ('shared_library', 'loadable_module', 'executable'):
       def_files = [s for s in spec.get('sources', []) if s.endswith('.def')]
       if len(def_files) == 1:
         ldflags.append('/DEF:"%s"' % gyp_to_build_path(def_files[0]))
       elif len(def_files) > 1:
         raise Exception("Multiple .def files")
 
-  def GetLdflags(self, config, product_dir, gyp_to_build_path):
+  def GetLdflags(self, config, gyp_to_build_path, expand_special):
     """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.GetOutputName(config, expand_special)
     if out:
-      ldflags.append(self.ConvertVSMacros(out))
+      ldflags.append('/OUT:' + 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', default='')
     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
 
@@ skipping 43 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