Changed recipe_modules base paths to be abstract entities in their own right.

scripts/slave/recipe_loader.py

 # Copyright 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.
 
 import copy
 import imp
 import inspect
 import os
 import sys
 
 from .recipe_util import (ROOT_PATH, RECIPE_DIRS, MODULE_DIRS,
                           cached_unary, scan_directory)
 from .recipe_api import RecipeApi, RecipeApiPlain
 from .recipe_config import ConfigContext
-from .recipe_config_types import Path
+from .recipe_config_types import Path, ModuleBasePath
 from .recipe_test_api import RecipeTestApi, DisabledTestData
 
 
-# Keys MUST match base paths defined in recipe_modules/path/config.py.
-MODULES_BASE_PATHS = {
-  'build': os.path.join(ROOT_PATH, 'build'),
-  'build_internal': os.path.join(ROOT_PATH, 'build_internal'),
-}
-
-
 class NoSuchRecipe(Exception):
   """Raised by load_recipe is recipe is not found."""
 
 
 class RecipeScript(object):
   """Holds dict of an evaluated recipe script."""
 
   def __init__(self, recipe_dict):
     for k, v in recipe_dict.iteritems():
       setattr(self, k, v)
@@ skipping 11 matching lines @@
     """Converts python module object into RecipeScript instance."""
     return cls(module_obj.__dict__)
 
 
 def load_recipe_modules(mod_dirs):
   """Makes a python module object that have all recipe modules in its dict.
 
   Args:
     mod_dirs (list of str): list of module search paths.
   """
-  def get_module_directory(path):
-    """Path to a module as a string -> recipe_config_types.Path object."""
-    dir_path = os.path.dirname(os.path.abspath(path))
-    for key, base_path in MODULES_BASE_PATHS.iteritems():
-      if dir_path.startswith(base_path + os.path.sep):
-        suffix = dir_path[len(base_path)+1:].split(os.path.sep)
-        return Path(key, *suffix, _bypass=True)
-    raise AssertionError('Unexpected module path: %s' % (dir_path,))
-
   def patchup_module(name, submod):
     """Finds framework related classes and functions in a |submod| and adds
     them to |submod| as top level constants with well known names such as
     API, CONFIG_CTX and TEST_API.
 
     |submod| is a recipe module (akin to python package) with submodules such as
     'api', 'config', 'test_api'. This function scans through dicts of that
     submodules to find subclasses of RecipeApi, RecipeTestApi, etc.
     """
     submod.NAME = name
-    submod.MODULE_DIRECTORY = get_module_directory(submod.__file__)
+    submod.MODULE_DIRECTORY = Path(ModuleBasePath(submod))
     submod.CONFIG_CTX = getattr(submod, 'CONFIG_CTX', None)
     submod.DEPS = frozenset(getattr(submod, 'DEPS', ()))
 
     if hasattr(submod, 'config'):
       for v in submod.config.__dict__.itervalues():
         if isinstance(v, ConfigContext):
           assert not submod.CONFIG_CTX, (
             'More than one configuration context: %s' % (submod.config))
           submod.CONFIG_CTX = v
       assert submod.CONFIG_CTX, 'Config file, but no config context?'
@@ skipping 224 matching lines @@
   """
   for path in RECIPE_DIRS():
     for recipe in scan_directory(
         path, lambda f: f.endswith('.py') and f[0] != '_'):
       yield recipe, recipe[len(path)+1:-len('.py')]
   for path in MODULE_DIRS():
     for recipe in scan_directory(
         path, lambda f: f.endswith('example.py')):
       module_name = os.path.dirname(recipe)[len(path)+1:]
       yield recipe, '%s:example' % module_name