Make sure drover works when depot_tools is not in the path.

drover.py

 # Copyright (c) 2009 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.
 
 import optparse
 import os
 import re
 import subprocess
 import sys
 import webbrowser
@@ skipping 43 matching lines @@
 def clobberDir(dir):
   """Removes a given directory"""
 
   if (os.path.exists(dir)):
     print dir + " directory found, deleting"
     # The following line was removed due to access controls in Windows
     # which make os.unlink(path) calls impossible.
     #TODO(laforge) : Is this correct?
     deltree(dir)
 
+def rungcl(subcommand):
+  gcl_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "gcl")
+  if not os.path.exists(gcl_path):
+    print "WARNING: gcl not found beside drover.py. Using system gcl instead..."
+    gcl_path = 'gcl'
+
+  command = "%s %s" % (gcl_path, subcommand)
+  return os.system(command)
+
 def gclUpload(revision, author):
-  command = ("gcl upload " + str(revision) +
+  command = ("upload " + str(revision) +
              " --send_mail --no_try --no_presubmit --reviewers=" + author)
-  os.system(command)
+  return rungcl(command)
 
 def getSVNInfo(url, revision):
   command = 'svn info ' + url + "@"+str(revision)
   svn_info = subprocess.Popen(command,
                               shell=True,
                               stdout=subprocess.PIPE,
                               stderr=subprocess.PIPE).stdout.readlines()
   info = {}
   for line in svn_info:
     match = re.search(r"(.*?):(.*)", line)
@@ skipping 334 matching lines @@
   author = getAuthor(TRUNK_URL, revision)
 
   filename = str(revision)+".txt"
   out = open(filename,"w")
   out.write(action +" " + str(revision) + " - ")
   out.write(getRevisionLog(url, revision))
   if (author):
     out.write("TBR=" + author)
   out.close()
 
-  change_cmd = 'gcl change ' + str(revision) + " " + filename
+  change_cmd = 'change ' + str(revision) + " " + filename
   if options.revertbot:
     change_cmd += ' --silent'
-  os.system(change_cmd)
+  rungcl(change_cmd)
   os.unlink(filename)
   print author
   print revision
   print ("gcl upload " + str(revision) +
          " --send_mail --no_try --no_presubmit --reviewers=" + author)
 
   if options.revertbot or prompt("Would you like to upload?"):
     if PROMPT_FOR_AUTHOR:
       author = text_prompt("Enter new author or press enter to accept default",
                            author)
     if options.revertbot and options.revertbot_reviewers:
       author += ","
       author += options.revertbot_reviewers
     gclUpload(revision, author)
   else:
     print "Deleting the changelist."
     print "gcl delete " + str(revision)
-    os.system("gcl delete " + str(revision))
+    rungcl("delete " + str(revision))
     sys.exit(0)
 
   # We commit if the reverbot is set to commit automatically, or if this is
   # not the revertbot and the user agrees.
   if options.revertbot_commit or (not options.revertbot and
                                   prompt("Would you like to commit?")):
     print "gcl commit " + str(revision) + " --no_presubmit --force"
-    os.system("gcl commit " + str(revision) + " --no_presubmit --force")
+    rungcl("commit " + str(revision) + " --no_presubmit --force")
   else:
     sys.exit(0)
 
 if __name__ == "__main__":
   option_parser = optparse.OptionParser(usage=USAGE % {"app": sys.argv[0]})
   option_parser.add_option('-m', '--merge', type="int",
                            help='Revision to merge from trunk to branch')
   option_parser.add_option('-b', '--branch',
                            help='Branch to revert or merge from')
   option_parser.add_option('-r', '--revert', type="int",
                            help='Revision to revert')
   option_parser.add_option('-w', '--workdir',
                            help='subdir to use for the revert')
   option_parser.add_option('', '--revertbot', action='store_true',
                            default=False)
   option_parser.add_option('', '--revertbot-commit', action='store_true',
                            default=False)
   option_parser.add_option('', '--revertbot-reviewers')
   options, args = option_parser.parse_args()
 
   if not options.merge and not options.revert:
     option_parser.error("You need at least --merge or --revert")
     sys.exit(1)
 
   if options.merge and not options.branch:
     option_parser.error("--merge requires a --branch")
     sys.exit(1)
 
-  sys.exit(main(options, args))
+  sys.exit(main(options, args))