Revert of Cross-repo recipe package system.

scripts/slave/bot_update.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.
 
 # TODO(hinoka): Use logging.
 
 import cStringIO
 import codecs
 import collections
@@ skipping 24 matching lines @@
 # Relative to the current working directory.
 CURRENT_DIR = path.abspath(os.getcwd())
 BUILDER_DIR = path.dirname(CURRENT_DIR)
 SLAVE_DIR = path.dirname(BUILDER_DIR)
 
 # Relative to this script's filesystem path.
 THIS_DIR = path.dirname(path.abspath(__file__))
 SCRIPTS_DIR = path.dirname(THIS_DIR)
 BUILD_DIR = path.dirname(SCRIPTS_DIR)
 ROOT_DIR = path.dirname(BUILD_DIR)
+BUILD_INTERNAL_DIR = path.join(ROOT_DIR, 'build_internal')
 DEPOT_TOOLS_DIR = path.join(ROOT_DIR, 'depot_tools')
 
-# TODO(luqui): This is a horrible hack to identify build_internal when build
-# is a recipe dependency.  bot_update should not be depending on internal,
-# rather the arrow should go the other way (or just be destroyed).
-def check_build_internal(d):
-  d = path.abspath(d)
-  if path.basename(d) == 'build_internal' and path.isdir(d):
-    return d
-  else:
-    return None
-
-BUILD_INTERNAL_DIR = (
-    check_build_internal(path.join(ROOT_DIR, 'build_internal')) or
-    check_build_internal(path.join(ROOT_DIR,      # .recipe_deps
-                                   path.pardir,   # slave
-                                   path.pardir,   # scripts
-                                   path.pardir))) # build_internal
-
 
 CHROMIUM_GIT_HOST = 'https://chromium.googlesource.com'
 CHROMIUM_SRC_URL = CHROMIUM_GIT_HOST + '/chromium/src.git'
 
 # Official builds use buildspecs, so this is a special case.
 BUILDSPEC_TYPE = collections.namedtuple('buildspec',
     ('container', 'version'))
 BUILDSPEC_RE = (r'^/chrome-internal/trunk/tools/buildspec/'
                  '(build|branches|releases)/(.+)$')
 GIT_BUILDSPEC_PATH = ('https://chrome-internal.googlesource.com/chrome/tools/'
@@ skipping 122 matching lines @@
 
 GCLIENT_TEMPLATE = """solutions = %(solutions)s
 
 cache_dir = r%(cache_dir)s
 %(target_os)s
 %(target_os_only)s
 """
 
 
 internal_data = {}
-if BUILD_INTERNAL_DIR:
+if os.path.isdir(BUILD_INTERNAL_DIR):
   local_vars = {}
   try:
     execfile(os.path.join(
         BUILD_INTERNAL_DIR, 'scripts', 'slave', 'bot_update_cfg.py'),
         local_vars)
   except Exception:
     # Same as if BUILD_INTERNAL_DIR didn't exist in the first place.
     print 'Warning: unable to read internal configuration file.'
     print 'If this is an internal bot, this step may be erroneously inactive.'
   internal_data = local_vars
@@ skipping 108 matching lines @@
 GIT_CACHE_PATH = path.join(DEPOT_TOOLS_DIR, 'git_cache.py')
 CACHE_DIR = path.join(SLAVE_DIR, 'cache_dir')
 # Because we print CACHE_DIR out into a .gclient file, and then later run
 # eval() on it, backslashes need to be escaped, otherwise "E:\b\build" gets
 # parsed as "E:[\x08][\x08]uild".
 if sys.platform.startswith('win'):
   CACHE_DIR = CACHE_DIR.replace('\\', '\\\\')
 
 # Find the patch tool.
 if sys.platform.startswith('win'):
-  if not BUILD_INTERNAL_DIR:
-    print 'Warning: could not find patch tool because there is no '
-    print 'build_internal present.'
-    PATCH_TOOL = None
-  else:
-    PATCH_TOOL = path.join(BUILD_INTERNAL_DIR, 'tools', 'patch.EXE')
+  PATCH_TOOL = path.join(BUILD_INTERNAL_DIR, 'tools', 'patch.EXE')
 else:
   PATCH_TOOL = '/usr/bin/patch'
 
 # If there is less than 100GB of disk space on the system, then we do
 # a shallow checkout.
 SHALLOW_CLONE_THRESHOLD = 100 * 1024 * 1024 * 1024
 
 
 class SubprocessFailed(Exception):
   def __init__(self, message, code, output):
@@ skipping 1339 matching lines @@
   except Exception:
     # Unexpected failure.
     emit_flag(options.flag_file)
     raise
   else:
     emit_flag(options.flag_file)
 
 
 if __name__ == '__main__':
   sys.exit(main())