ninja windows: handle more cases in program quoting

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 35 matching lines @@
   # These commands are used in rsp files, so no escaping for the shell (via ^)
   # is necessary.
 
   # Finally, wrap the whole thing in quotes so that the above quote rule
   # applies and whitespace isn't a word break.
   return '"' + arg + '"'
 
 
 def EncodeRspFileList(args):
   """Process a list of arguments using QuoteCmdExeArgument."""
-  return ' '.join(QuoteForRspFile(arg) for arg in args)
+  # Note that the first argument is assumed to be the command. We take extra
+  # steps to make sure that calls to .bat files are handled correctly, and
+  # that paths are normalized and quoted as necessary.
+  if not args: return ''
+  program = args[0]
+  if program.startswith('call '):
+    call, batch = program.split(' ', 1)
+    program = 'call ' + QuoteForRspFile(os.path.normpath(batch))
+  else:
+    program = os.path.normpath(program)
+    # Don't add quotes around things without spaces so that 'call', 'echo',
+    # etc. will work if they're specified as individual arguments.
+    if ' ' in program:
+      program = QuoteForRspFile(program)
+  return program + ' ' + ' '.join(QuoteForRspFile(arg) for arg in args[1:])
 
 
 def _GenericRetrieve(root, default, path):
   """Given a list of dictionary keys |path| and a tree of dicts |root|, find
   value at path, or return |default| if any of the path doesn't exist."""
   if not root:
     return default
   if not path:
     return root
   return _GenericRetrieve(root.get(path[0]), default, path[1:])
@@ skipping 403 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