Detect and warn on missing vcvarsall.bat

build/toolchain/win/setup_toolchain.py

Index: build/toolchain/win/setup_toolchain.py
diff --git a/build/toolchain/win/setup_toolchain.py b/build/toolchain/win/setup_toolchain.py
index 4dd077cc1c1b4a8ed004d8256bcde85cbdc22b5b..acf9268b0f8f5801d6cb0a2a7b11dc7dfc1d424a 100644
--- a/build/toolchain/win/setup_toolchain.py
+++ b/build/toolchain/win/setup_toolchain.py
@@ -117,9 +117,13 @@ def _LoadToolchainEnv(cpu, sdk_dir):
     if 'GYP_MSVS_OVERRIDE_PATH' not in os.environ:
       os.environ['GYP_MSVS_OVERRIDE_PATH'] = _DetectVisualStudioPath()
     # We only support x64-hosted tools.
-    args = [os.path.normpath(os.path.join(os.environ['GYP_MSVS_OVERRIDE_PATH'],
-                                          'VC/vcvarsall.bat')),
-            'amd64_x86' if cpu == 'x86' else 'amd64']
+    script_path = os.path.normpath(os.path.join(
+                                   os.environ['GYP_MSVS_OVERRIDE_PATH'],

[scottmg, 2016/03/23 19:30:13]

+indent here, they're arguments to join() not normpath().

[brucedawson, 2016/03/23 19:35:22]

I'm unclear about what is desired here. Indenting to join( pushes the line
length beyond 80. Just indent an extra few characters? "git cl format" doesn't
help unfortunately :-(

+                                   'VC/vcvarsall.bat'))
+    if not os.path.exists(script_path):
+      raise Exception('%s is missing - make sure VC++ tools are installed.'
+                      % script_path)

[scottmg, 2016/03/23 19:30:13]

% on previous line

[brucedawson, 2016/03/23 19:35:22]

So, increase indent by one? Done.

+    args = [script_path, 'amd64_x86' if cpu == 'x86' else 'amd64']
     variables = _LoadEnvFromBat(args)
   return _ExtractImportantEnvironment(variables)