Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(449)

Unified Diff: scripts/slave/annotated_run.py

Issue 1241323004: Cross-repo recipe package system. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Moved show_me_the_modules into recipe_engine Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/annotated_run.py
diff --git a/scripts/slave/annotated_run.py b/scripts/slave/annotated_run.py
index 31a6cf5599310e33dcc963db77d9dbcecf6668be..3f20ca9007376842c68e5adff9065a0634729b72 100755
--- a/scripts/slave/annotated_run.py
+++ b/scripts/slave/annotated_run.py
@@ -19,9 +19,13 @@ sys.path.append(os.path.join(BUILD_ROOT, 'third_party'))
from common import annotator
from common import chromium_utils
from common import master_cfg_utils
-from slave import recipe_universe
+from recipe_engine import loader
from recipe_engine import main as recipe_main
+from recipe_engine import package
+
+PACKAGE_PYL = os.path.join(
luqui 2015/08/06 20:57:57 Oops. TODO: fix this script and write a test for
luqui 2015/08/20 22:45:23 Done
+ os.path.dirname(os.path.abspath(__file__)), 'recipe_package.pyl')
@contextlib.contextmanager
def namedTempFile():
@@ -203,8 +207,8 @@ def main(argv):
opts.factory_properties, opts.build_properties,
opts.master_overrides_slave)
stream = annotator.StructuredAnnotationStream()
- ret = recipe_main.run_steps(properties, stream,
- universe=recipe_universe.get_universe())
+ universe = loader.RecipeUniverse(package.PackageDeps.create(PACKAGE_PYL))
+ ret = recipe_main.run_steps(properties, stream, universe=universe)
return ret.status_code

Powered by Google App Engine
This is Rietveld 408576698