Revert of depot_tools: add infra_paths recipe module for infra-specific paths

recipe_modules/gclient/api.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.
 
 from recipe_engine import recipe_api
 
 
 class RevisionResolver(object):
   """Resolves the revision based on build properties."""
 
@@ skipping 116 matching lines @@
   def spec_alias(self, name):
     self._spec_alias = name
 
   @spec_alias.deleter
   def spec_alias(self):
     self._spec_alias = None
 
   def get_config_defaults(self):
     return {
       'USE_MIRROR': self.use_mirror,
-      'CACHE_DIR': self.m.infra_paths['git_cache'],
+      'CACHE_DIR': self.m.path['git_cache'],
     }
 
   @staticmethod
   def config_to_pythonish(cfg):
     return jsonish_to_python(cfg.as_jsonish(), True)
 
   def resolve_revision(self, revision):
     if hasattr(revision, 'resolve'):
       return revision.resolve(self.m.properties)
     return revision
@@ skipping 121 matching lines @@
 
         cfg_cmds = [
           ('user.name', 'local_bot'),
           ('user.email', 'local_bot@example.com'),
         ]
         for var, val in cfg_cmds:
           name = 'recurse (git config %s)' % var
           self(name, ['recurse', 'git', 'config', var, val], **kwargs)
 
     finally:
-      cwd = kwargs.get('cwd', self.m.infra_paths['slave_build'])
+      cwd = kwargs.get('cwd', self.m.path['slave_build'])
       if 'checkout' not in self.m.path:
         self.m.path['checkout'] = cwd.join(
           *cfg.solutions[0].name.split(self.m.path.sep))
 
     return sync_step
 
   def revert(self, **kwargs):
     """Return a gclient_safe_revert step."""
     # Not directly calling gclient, so don't use self().
     alias = self.spec_alias
     prefix = '%sgclient ' % (('[spec: %s] ' % alias) if alias else '')
 
     return self.m.python(prefix + 'revert',
-        self.m.infra_paths['build'].join(
-            'scripts', 'slave', 'gclient_safe_revert.py'),
-        [
-            '.',
-            self.m.infra_paths['depot_tools'].join(
-                'gclient', platform_ext={'win': '.bat'})
-        ],
+        self.m.path['build'].join('scripts', 'slave', 'gclient_safe_revert.py'),
+        ['.', self.m.path['depot_tools'].join('gclient',
+                                              platform_ext={'win': '.bat'})],
         infra_step=True,
         **kwargs
     )
 
   def runhooks(self, args=None, name='runhooks', **kwargs):
     args = args or []
     assert isinstance(args, (list, tuple))
     return self(
       name, ['runhooks'] + list(args), infra_step=False, **kwargs)
 
@@ skipping 21 matching lines @@
 
         build_path = sys.argv[1]
         if os.path.exists(build_path):
           for (path, dir, files) in os.walk(build_path):
             for cur_file in files:
               if cur_file.endswith('index.lock'):
                 path_to_file = os.path.join(path, cur_file)
                 print 'deleting %s' % path_to_file
                 os.remove(path_to_file)
       """,
-      args=[self.m.infra_paths['slave_build']],
+      args=[self.m.path['slave_build']],
       infra_step=True,
     )
 
   def calculate_patch_root(self, patch_project, gclient_config=None):
     """Returns path where a patch should be applied to based patch_project.
 
     Maps "patch_project" to a path of directories relative to checkout's root,
     which describe where to place the patch.
 
     For now, considers only first solution (c.solutions[0]), but in theory can
@@ skipping 21 matching lines @@
     """Updates config revision corresponding to patch_project.
 
     Useful for bot_update only, as this is the only consumer of gclient's config
     revision map. This doesn't overwrite the revision if it was already set.
     """
     assert patch_project is None or isinstance(patch_project, basestring)
     cfg = gclient_config or self.c
     path, revision = cfg.patch_projects.get(patch_project, (None, None))
     if path and revision and path not in cfg.revisions:
       cfg.revisions[path] = revision