Fix go bootstrap on Windows.

go/bootstrap.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """Prepares a local hermetic Go installation.
 
 - Downloads and unpacks the Go toolset in ../../golang.
 - Downloads and installs goop and golint.
 - Fetches code dependencies via goop.
@@ skipping 27 matching lines @@
 
 # Where Go GAE SDK is supposedly installed.
 GO_APPENGINE = os.path.join(os.path.dirname(ROOT), 'go_appengine')
 
 # Default workspace with infra go code.
 WORKSPACE = os.path.join(ROOT, 'go')
 
 # Platform depended suffix for executable files.
 EXE_SFX = '.exe' if sys.platform == 'win32' else ''
 
+# On Windows we use git from depot_tools.
+GIT_EXE = 'git.bat' if sys.platform == 'win32' else 'git'
+
 # Pinned version of Go toolset to download.
 TOOLSET_VERSION = 'go1.4'
 
 # Platform dependent portion of a download URL. See http://golang.org/dl/.
 TOOLSET_VARIANTS = {
   ('darwin', 'x86-32'): 'darwin-386-osx10.8.tar.gz',
   ('darwin', 'x86-64'): 'darwin-amd64-osx10.8.tar.gz',
   ('linux2', 'x86-32'): 'linux-386.tar.gz',
   ('linux2', 'x86-64'): 'linux-amd64.tar.gz',
   ('win32', 'x86-32'): 'windows-386.zip',
@@ skipping 208 matching lines @@
       LOGGER.info('Copying %s -> %s', sdk_dir, tool_dir)
       shutil.copytree(sdk_dir, tool_dir)
 
     for pkg in GAE_HACK_PKGS:
       shutil.rmtree(os.path.join(base_tool_dir, pkg))
 
     patches = [os.path.join(WORKSPACE, 'patches', p)
                for p in os.listdir(os.path.join(WORKSPACE, 'patches'))
                if p.endswith('.patch')]
     for patch in patches:
-      subprocess.check_call(['git', 'apply'], cwd=toolset_root,
+      subprocess.check_call([GIT_EXE, 'apply'], cwd=toolset_root,
                             stdin=open(patch), stdout=sys.stderr)
 
     to_build = []
     for d in GAE_PKGS:
       to_build.extend(discover_targets(base_tool_dir, d))
 
     LOGGER.info('Building %d Appengine libs', len(to_build))
     subprocess.check_call(
         [get_go_exe(toolset_root), 'build'] + to_build,
         env=get_go_environ(toolset_root))
@@ skipping 60 matching lines @@
     fetch_tools_code(tmp, TOOLS_SOURCE)
     install(tmp, 'github.com/nitrous-io/goop')
     install(tmp, 'github.com/golang/lint/golint')
 
   LOGGER.info('tools are installed')
   write_file([toolset_root, 'INSTALLED_TOOLS'], available_tools)
 
 
 def fetch_tools_code(workspace, spec):
   """Fetches goop and golint source code with dependencies."""
-  git_exe = 'git.bat' if sys.platform == 'win32' else 'git'
   def git(cmd, cwd):
-    subprocess.check_call([git_exe] + cmd, cwd=cwd, stdout=sys.stderr)
+    subprocess.check_call([GIT_EXE] + cmd, cwd=cwd, stdout=sys.stderr)
   for path, repo in sorted(spec.iteritems()):
     path = os.path.join(workspace, path.replace('/', os.sep))
     os.makedirs(path)
     git(['init', '.'], cwd=path)
     git(['fetch', repo['url'], repo['ref']], cwd=path)
     git(['checkout', repo['rev']], cwd=path)
 
 
 def update_vendor_packages(toolset_root, workspace, force=False):
   """Runs goop to update external pinned packages."""
@@ skipping 155 matching lines @@
 def main(args):
   if args:
     print >> sys.stderr, sys.modules[__name__].__doc__,
     return 2
   bootstrap([WORKSPACE], logging.DEBUG)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))