clang/win: Support spaces in Visual Studio directory name

build/toolchain/win/setup_toolchain.py

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # Copies the given "win tool" (which the toolchain uses to wrap compiler
 # invocations) and the environment blocks for the 32-bit and 64-bit builds on
 # Windows to the build directory.
 #
 # The arguments are the visual studio install location and the location of the
 # win tool. The script assumes that the root build directory is the current dir
 # and the files will be written to the current directory.
 
 import errno
 import json
 import os
 import re
 import subprocess
 import sys
 
+sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir))
+import gn_helpers
+
 SCRIPT_DIR = os.path.dirname(__file__)
 
 def _ExtractImportantEnvironment(output_of_set):
   """Extracts environment variables required for the toolchain to run from
   a textual dump output by the cmd.exe 'set' command."""
   envvars_to_save = (
       'goma_.*', # TODO(scottmg): This is ugly, but needed for goma.
       'include',
       'lib',
       'libpath',
@@ skipping 167 matching lines @@
     env = _LoadToolchainEnv(cpu, win_sdk_path)
     env['PATH'] = runtime_dirs + os.pathsep + env['PATH']
 
     if cpu == target_cpu:
       for path in env['PATH'].split(os.pathsep):
         if os.path.exists(os.path.join(path, 'cl.exe')):
           vc_bin_dir = os.path.realpath(path)
           break
       # The separator for INCLUDE here must match the one used in
       # _LoadToolchainEnv() above.
-      include = ' '.join([include_prefix + p
-                          for p in env['INCLUDE'].split(';')])
+      include = [include_prefix + p for p in env['INCLUDE'].split(';')]

[hans, 2016/08/23 15:16:54]

Should we remove empty components from the result of the split? In the bug we're
ending up with an empty -imsvc option.

[Nico, 2016/08/23 15:23:32]

Yes, we should (...but we really shouldn't have those in the first place :-/)

Hm, I guess we don't control that if we rely on vcvarsall. Done.

+      include = ' '.join(['"' + i.replace('"', r'\"') + '"' for i in include])
 
     env_block = _FormatAsEnvironmentBlock(env)
     with open('environment.' + cpu, 'wb') as f:
       f.write(env_block)
 
     # Create a store app version of the environment.
     if 'LIB' in env:
       env['LIB']     = env['LIB']    .replace(r'\VC\LIB', r'\VC\LIB\STORE')
     if 'LIBPATH' in env:
       env['LIBPATH'] = env['LIBPATH'].replace(r'\VC\LIB', r'\VC\LIB\STORE')
     env_block = _FormatAsEnvironmentBlock(env)
     with open('environment.winrt_' + cpu, 'wb') as f:
       f.write(env_block)
 
   assert vc_bin_dir
-  assert '"' not in vc_bin_dir
-  print 'vc_bin_dir = "%s"' % vc_bin_dir
+  print 'vc_bin_dir = ' + gn_helpers.ToGNString(vc_bin_dir)
   assert include
-  assert '"' not in include
-  print 'include_flags = "%s"' % include
+  print 'include_flags = ' + gn_helpers.ToGNString(include)
 
 if __name__ == '__main__':
   main()