GN: Fix bootstrap call to setup_toolchain

The parameters to setup_toolchain changed, adding an OS parameter and a
filename for the environment file.

Additional fixes:
- Add missing base file to list of files
- vs_toolchain should output Windows paths properly escaped

Change-Id: I0e05bf34c8b603f16b901e76164e480121ed9d14
Reviewed-on: https://chromium-review.googlesource.com/1013926Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Yngve Pettersen <yngve@vivaldi.com>
Cr-Commit-Position: refs/heads/master@{#551341}

build/vs_toolchain.py

@@ -13,6 +13,7 @@ import shutil
 import stat
 import subprocess
 import sys
+from gn_helpers import ToGNString
 
 
 script_dir = os.path.dirname(os.path.realpath(__file__))
@@ -448,17 +449,17 @@ def GetToolchainDir():
   runtime_dll_dirs = SetEnvironmentAndGetRuntimeDllDirs()
   win_sdk_dir = SetEnvironmentAndGetSDKDir()
 
-  print '''vs_path = "%s"
-sdk_path = "%s"
-vs_version = "%s"
-wdk_dir = "%s"
-runtime_dirs = "%s"
+  print '''vs_path = %s
+sdk_path = %s
+vs_version = %s
+wdk_dir = %s
+runtime_dirs = %s
 ''' % (
-      NormalizePath(os.environ['GYP_MSVS_OVERRIDE_PATH']),
-      win_sdk_dir,
-      GetVisualStudioVersion(),
-      NormalizePath(os.environ.get('WDK_DIR', '')),
-      os.path.pathsep.join(runtime_dll_dirs or ['None']))
+      ToGNString(NormalizePath(os.environ['GYP_MSVS_OVERRIDE_PATH'])),
+      ToGNString(win_sdk_dir),
+      ToGNString(GetVisualStudioVersion()),
+      ToGNString(NormalizePath(os.environ.get('WDK_DIR', ''))),
+      ToGNString(os.path.pathsep.join(runtime_dll_dirs or ['None'])))
 
 
 def main():

tools/gn/bootstrap/bootstrap.py

@@ -129,7 +129,9 @@ def windows_prepare_toolchain(tempdir):
        toolchain_paths["vs_path"],
        toolchain_paths["sdk_path"],
        toolchain_paths["runtime_dirs"],
+       "win",
        "x64",
+       "environment.x64",
        "true"
       ],
       cwd=tempdir)