Ensure that we pick up 'git.bat' and 'svn.bat' on Windows.

fetch.py

 #!/usr/bin/env python
 # 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.
 
 """
 Tool to perform checkouts in one easy command line!
 
 Usage:
   fetch <recipe> [--property=value [--property2=value2 ...]]
 
 This script is a wrapper around various version control and repository
 checkout commands. It requires a |recipe| name, fetches data from that
 recipe in depot_tools/recipes, and then performs all necessary inits,
 checkouts, pulls, fetches, etc.
 
 Optional arguments may be passed on the command line in key-value pairs.
 These parameters will be passed through to the recipe's main method.
 """
 
 import json
 import os
 import subprocess
 import sys
 import pipes
 
+from distutils import spawn
+
 
 SCRIPT_PATH = os.path.dirname(os.path.abspath(__file__))
 
 
 #################################################
 # Checkout class definitions.
 #################################################
 class Checkout(object):
   """Base class for implementing different types of checkouts.
 
   Attributes:
     |base|: the absolute path of the directory in which this script is run.
     |spec|: the spec for this checkout as returned by the recipe. Different
         subclasses will expect different keys in this dictionary.
     |root|: the directory into which the checkout will be performed, as returned
         by the recipe. This is a relative path from |base|.
   """
   def __init__(self, dryrun, spec, root):
     self.base = os.getcwd()
     self.dryrun = dryrun
     self.spec = spec
     self.root = root
+    self._script_paths = {}
+    self._binary_paths = {}
 
   def exists(self):
     pass
 
   def init(self):
     pass
 
   def sync(self):
     pass
 
+  @staticmethod
+  def _find_executable(binary_name):
+    exe_name = binary_name + '.exe' if sys.platform == 'win32' else binary_name
+    path = spawn.find_executable(exe_name)
+    if path:
+      return path
+    return spawn.find_executable(os.path.join(SCRIPT_PATH, binary_name + '_bin',

[agable, 2013/04/11 18:21:09]

Isn't git installed to depot_tools\git-1.8.0_bin\ (not depot_tools\git\) on
windows machines?

+                                              exe_name))
+
+  def run_script(self, script, *args, **kwargs):
+    path = self._script_paths.get(script)
+    if not path:
+      path = os.path.join(SCRIPT_PATH, script + '.py')
+      if not os.path.exists(path):
+        print "Error: could not find '%s.py' in depot_tools" % script
+        return 1
+      self._script_paths[script] = path
+    print 'Running: %s %s' % (script,
+                              ' '.join(pipes.quote(arg) for arg in args))
+    if self.dryrun:
+      return 0
+    return subprocess.check_call((sys.executable, path) + args, **kwargs)
+
+  def run_binary(self, binary_name, *args, **kwargs):
+    path = self._binary_paths.get(binary_name)
+    if not path:
+      path = self._find_executable(binary_name)
+      if not path:
+        print "Error: could not find '%s' in PATH" % binary_name
+        return 1
+      self._binary_paths[binary_name] = path
+    print 'Running: %s %s' % (binary_name,
+                              ' '.join(pipes.quote(arg) for arg in args))
+    if self.dryrun:
+      return 0
+    return subprocess.check_call((path,) + args, **kwargs)
+
 
 class GclientCheckout(Checkout):
-
-  def run_gclient(self, *cmd, **kwargs):
-    print 'Running: gclient %s' % ' '.join(pipes.quote(x) for x in cmd)
-    if not self.dryrun:
-      return subprocess.check_call(
-          (sys.executable, os.path.join(SCRIPT_PATH, 'gclient.py')) + cmd,
-          **kwargs)
+  def run_gclient(self, *args, **kwargs):
+    return self.run_script('gclient', *args, **kwargs)
 
 
 class GitCheckout(Checkout):
-
-  def run_git(self, *cmd, **kwargs):
-    print 'Running: git %s' % ' '.join(pipes.quote(x) for x in cmd)
-    if not self.dryrun:
-      return subprocess.check_call(('git',) + cmd, **kwargs)
+  def run_git(self, *args, **kwargs):
+    return self.run_binary('git', *args, **kwargs)
 
 
 class SvnCheckout(Checkout):
-
-  def run_svn(self, *cmd, **kwargs):
-    print 'Running: svn %s' % ' '.join(pipes.quote(x) for x in cmd)
-    if not self.dryrun:
-      return subprocess.check_call(('svn',) + cmd, **kwargs)
+  def run_svn(self, *args, **kwargs):
+    return self.run_binary('svn', *args, **kwargs)
 
 
 class GclientGitSvnCheckout(GclientCheckout, GitCheckout, SvnCheckout):
 
   def __init__(self, dryrun, spec, root):
     super(GclientGitSvnCheckout, self).__init__(dryrun, spec, root)
     assert 'solutions' in self.spec
     keys = ['solutions', 'target_os', 'target_os_only']
     gclient_spec = '\n'.join('%s = %s' % (key, self.spec[key])
                              for key in self.spec if key in keys)
@@ skipping 150 matching lines @@
 
 
 def main():
   dryrun, recipe, props = handle_args(sys.argv)
   spec, root = run_recipe_fetch(recipe, props)
   return run(dryrun, spec, root)
 
 
 if __name__ == '__main__':
   sys.exit(main())