[NaCl SDK] Update Windows build to use vs2013 from depot_tools.

native_client_sdk/src/build_tools/buildbot_common.py

 # Copyright (c) 2012 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.
 
 """Common utilities for all buildbot scripts that specifically don't rely
 on having a full chromium checkout.
 """
 
 import os
 import subprocess
@@ skipping 40 matching lines @@
   sys.stderr.write(str(msg) + '\n')
   sys.exit(1)
 
 
 def Trace(msg):
   if verbose:
     sys.stderr.write(str(msg) + '\n')
 
 
 def GetWindowsEnvironment():
+  if oshelpers.FindExeInPath('cl.exe') is not None:
+    # cl.exe is already in the path, let's just use that.
+    return os.environ
+
   sys.path.append(os.path.join(NACL_DIR, 'buildbot'))
   import buildbot_standard
 
   # buildbot_standard.SetupWindowsEnvironment expects a "context" object. We'll
   # fake enough of that here to work.
   class FakeContext(object):
     def __init__(self):
       self.env = os.environ
 
     def GetEnv(self, key):
       return self.env[key]
 
     def __getitem__(self, key):
       # The nacl side script now needs gyp_vars to return a list.
       if key == 'gyp_vars':
         return []
       return self.env[key]
 
     def SetEnv(self, key, value):
       self.env[key] = value
 
     def __setitem__(self, key, value):
       self.env[key] = value
 
   context = FakeContext()
   buildbot_standard.SetupWindowsEnvironment(context)
 
-  # buildbot_standard.SetupWindowsEnvironment adds the directory which contains
-  # vcvarsall.bat to the path, but not the directory which contains cl.exe,
-  # link.exe, etc.
-  # Running vcvarsall.bat adds the correct directories to the path, which we
-  # extract below.
-  process = subprocess.Popen('vcvarsall.bat x86 > NUL && set',
+  env_script = 'vcvarsall.bat'
+
+  if not oshelpers.FindExeInPath(env_script):
+    # This might happen if Visual Studio is not installed. Check to see if
+    # vs2013 is in depot_tools.
+
+    # Find depot_tools by looking for gclient.bat.
+    gclient_bat = oshelpers.FindExeInPath('gclient.bat')
+    if gclient_bat is None:
+      ErrorExit('gclient.bat is not in the path. Where is depot_tools?')
+
+    depot_tools_dir = os.path.dirname(gclient_bat)
+    vs2013_dir = os.path.join(depot_tools_dir, 'win_toolchain', 'vs2013_files')
+    if not os.path.exists(vs2013_dir):
+      ErrorExit('Visual Studio not installed normally or in depot_tools.')
+
+    # The depot_tools vs2013 toolchain has its own batch file (not
+    # vcvarsall.bat) for setting the environment variables needed by vs2013.
+    env_script = os.path.join(vs2013_dir, 'win8sdk', 'bin', 'SetEnv.cmd')
+
+  # Running the env_script adds the correct directories to the path for
+  # executables (e.g. cl.exe, link.exe), include paths, lib directories, etc,
+  # which we extract below.
+  process = subprocess.Popen(env_script + ' x86 > NUL && set',
       stdout=subprocess.PIPE, env=context.env, shell=True)
   stdout, _ = process.communicate()
 
   # Parse environment from "set" command above.
   # It looks like this:
   # KEY1=VALUE1\r\n
   # KEY2=VALUE2\r\n
   # ...
   return dict(line.split('=', 1) for line in stdout.split('\r\n')[:-1])
 
@@ skipping 99 matching lines @@
   # Without shell=True the windows implementation of subprocess.call will not
   # search the PATH for the executable: http://bugs.python.org/issue8557
   shell = getos.GetPlatform() == 'win'
 
   cmd = [GetGsutil(), 'cp', '-a', 'public-read', filename, full_dst]
   Run(cmd, shell=shell, cwd=cwd)
   url = 'https://storage.googleapis.com/%s/%s' % (bucket_path, filename)
   if step_link:
     sys.stdout.flush()
     sys.stderr.write('@@@STEP_LINK@download@%s@@@\n' % url)