Fix quoting shell args on Windows

pylib/gyp/generator/ninja.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.
 
 import copy
 import gyp
 import gyp.common
+import gyp.msvs_emulation
 import gyp.system_test
 import gyp.xcode_emulation
 import os.path
 import re
 import subprocess
 import sys
 
 import gyp.ninja_syntax as ninja_syntax
 
 generator_default_variables = {
@@ skipping 30 matching lines @@
 # - how to decide what the host compiler is (should not just be $cc).
 # - need ld_host as well.
 generator_supports_multiple_toolsets = False
 
 
 def StripPrefix(arg, prefix):
   if arg.startswith(prefix):
     return arg[len(prefix):]
   return arg
 
-
-def QuoteShellArgument(arg):
+def QuoteShellArgument(arg, flavor):
   """Quote a string such that it will be interpreted as a single argument
   by the shell."""
   # Rather than attempting to enumerate the bad shell characters, just
   # whitelist common OK ones and quote anything else.
   if re.match(r'^[a-zA-Z0-9_=-]+$', arg):
     return arg  # No quoting necessary.
+  if flavor == 'win':
+    return gyp.msvs_emulation.QuoteCmdExeArgument(arg)
   return "'" + arg.replace("'", "'" + '"\'"' + "'")  + "'"
 
-
 def InvertRelativePath(path):
   """Given a relative path like foo/bar, return the inverse relative path:
   the path from the relative path back to the origin dir.
 
   E.g. os.path.normpath(os.path.join(path, InvertRelativePath(path)))
   should always produce the empty string."""
 
   if not path:
     return path
   # Only need to handle relative paths into subdirectories for now.
@@ skipping 470 matching lines @@
     info_plist, out, defines, extra_env = gyp.xcode_emulation.GetMacInfoPlist(
         self.ExpandSpecial(generator_default_variables['PRODUCT_DIR']),
         self.xcode_settings, self.GypPathToNinja)
     if not info_plist:
       return
     if defines:
       # Create an intermediate file to store preprocessed results.
       intermediate_plist = self.GypPathToUniqueOutput(
           os.path.basename(info_plist))
       defines = ' '.join(
-          [QuoteShellArgument(ninja_syntax.escape('-D' + d)) for d in defines])
+          [QuoteShellArgument(ninja_syntax.escape('-D' + d), self.flavor)
+           for d in defines])
       info_plist = self.ninja.build(intermediate_plist, 'infoplist', info_plist,
                                     variables=[('defines',defines)])
 
     env = self.GetXcodeEnv(additional_settings=extra_env)
     env = self.ComputeExportEnvString(env)
 
     self.ninja.build(out, 'mac_tool', info_plist,
                      variables=[('mactool_cmd', 'copy-info-plist'),
                                 ('env', env)])
     bundle_depends.append(out)
@@ skipping 12 matching lines @@
       cflags_objc = ['$cflags_c'] + \
                     self.xcode_settings.GetCflagsObjC(config_name)
       cflags_objcc = ['$cflags_cc'] + \
                      self.xcode_settings.GetCflagsObjCC(config_name)
     else:
       cflags = config.get('cflags', [])
       cflags_c = config.get('cflags_c', [])
       cflags_cc = config.get('cflags_cc', [])
 
     self.WriteVariableList('defines',
-        [QuoteShellArgument(ninja_syntax.escape('-D' + d))
+        [QuoteShellArgument(ninja_syntax.escape('-D' + d), self.flavor)
          for d in config.get('defines', [])])
     self.WriteVariableList('includes',
                            ['-I' + self.GypPathToNinja(i)
                             for i in config.get('include_dirs', [])])
 
     pch_commands = precompiled_header.GetGchBuildCommands()
     if self.flavor == 'mac':
       self.WriteVariableList('cflags_pch_c',
                              [precompiled_header.GetInclude('c')])
       self.WriteVariableList('cflags_pch_cc',
@@ skipping 175 matching lines @@
           strip_save_file)
     return self.GetXcodeEnv(additional_settings=postbuild_settings)
 
   def GetPostbuildCommand(self, spec, output, output_binary,
                           is_command_start=False):
     """Returns a shell command that runs all the postbuilds, and removes
     |output| if any of them fails. If |is_command_start| is False, then the
     returned string will start with ' && '."""
     if not self.xcode_settings or spec['type'] == 'none' or not output:
       return ''
-    output = QuoteShellArgument(output)
+    output = QuoteShellArgument(output, self.flavor)
     target_postbuilds = self.xcode_settings.GetTargetPostbuilds(
-        self.config_name, output, QuoteShellArgument(output_binary), quiet=True)
+        self.config_name,
+        output,
+        QuoteShellArgument(output_binary, self.flavor),
+        quiet=True)
     postbuilds = gyp.xcode_emulation.GetSpecPostbuildCommands(
         spec, self.GypPathToNinja, quiet=True)
     postbuilds = target_postbuilds + postbuilds
     if not postbuilds:
       return ''
     env = self.ComputeExportEnvString(self.GetXcodePostbuildEnv())
     commands = env + ' F=0; ' + \
         ' '.join([ninja_syntax.escape(command) + ' || F=$$?;'
                                  for command in postbuilds])
     command_string = env + commands + ' ((exit $$F) || rm -rf %s) ' % output + \
@@ skipping 446 matching lines @@
 
   user_config = params.get('generator_flags', {}).get('config', None)
   if user_config:
     GenerateOutputForConfig(target_list, target_dicts, data, params,
                             user_config)
   else:
     config_names = target_dicts[target_list[0]]['configurations'].keys()
     for config_name in config_names:
       GenerateOutputForConfig(target_list, target_dicts, data, params,
                               config_name)