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

Unified Diff: scripts/slave/recipes/chromium.chromedriver.recipe_autogen.py

Issue 1919193002: build: roll infra_paths changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: merge Created 4 years, 8 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/recipes/chromium.chromedriver.recipe_autogen.py
diff --git a/scripts/slave/recipes/chromium.chromedriver.recipe_autogen.py b/scripts/slave/recipes/chromium.chromedriver.recipe_autogen.py
index 281ff78f8e117e5a25fdc3693801ba6af8db15a7..2f8b832f2164b20e9546f6a9ef4311d622c393f5 100644
--- a/scripts/slave/recipes/chromium.chromedriver.recipe_autogen.py
+++ b/scripts/slave/recipes/chromium.chromedriver.recipe_autogen.py
@@ -6,6 +6,7 @@ DEPS = [
'depot_tools/bot_update',
'chromium',
'depot_tools/gclient',
+ 'depot_tools/infra_paths',
'recipe_engine/json',
'recipe_engine/path',
'recipe_engine/properties',
@@ -57,16 +58,16 @@ def Linux32_steps(api):
'DEPOT_TOOLS_UPDATE': '0',
'GYP_DEFINES':
'branding=Chrome buildtype=Official component=static_library'}
- api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+ api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
"slave", "runhooks_wrapper.py"), env=env)
# cleanup_temp step
api.chromium.cleanup_temp()
# chromedriver compile.py step
- api.python("compile", api.path["build"].join("scripts", "slave",
+ api.python("compile", api.infra_paths['build'].join("scripts", "slave",
"compile.py"), args=['--target', 'Release',
'chromium_builder_chromedriver'])
# annotated_steps step
- api.python("annotated_steps", api.path["build"].join("scripts", "slave",
+ api.python("annotated_steps", api.infra_paths['build'].join("scripts", "slave",
"chromium", "chromedriver_buildbot_run.py"),
args=['--build-properties=%s' % api.json.dumps(build_properties,
separators=(',', ':')), '--factory-properties={"annotated_script":'+\
@@ -120,16 +121,16 @@ def Mac_10_6_steps(api):
# gclient runhooks wrapper step
env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
'DEPOT_TOOLS_UPDATE': '0', 'GYP_DEFINES': ' component=static_library'}
- api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+ api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
"slave", "runhooks_wrapper.py"), env=env)
# cleanup_temp step
api.chromium.cleanup_temp()
# chromedriver compile.py step
- api.python("compile", api.path["build"].join("scripts", "slave",
+ api.python("compile", api.infra_paths['build'].join("scripts", "slave",
"compile.py"), args=['--target', 'Release', '--', '-project',
'../build/all.xcodeproj', '-target', 'chromium_builder_chromedriver'])
# annotated_steps step
- api.python("annotated_steps", api.path["build"].join("scripts", "slave",
+ api.python("annotated_steps", api.infra_paths['build'].join("scripts", "slave",
"chromium", "chromedriver_buildbot_run.py"),
args=['--build-properties=%s' % api.json.dumps(build_properties,
separators=(',', ':')), '--factory-properties={"annotated_script":"c'+\
@@ -142,7 +143,7 @@ def Mac_10_6_steps(api):
def Win7_steps(api):
# update scripts step; implicitly run by recipe engine.
# taskkill step
- api.python("taskkill", api.path["build"].join("scripts", "slave",
+ api.python("taskkill", api.infra_paths['build'].join("scripts", "slave",
"kill_processes.py"))
# bot_update step
src_cfg = api.gclient.make_config(GIT_MODE=True)
@@ -184,16 +185,16 @@ def Win7_steps(api):
# gclient runhooks wrapper step
env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
'DEPOT_TOOLS_UPDATE': '0','GYP_DEFINES': ' component=static_library'}
- api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+ api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
"slave", "runhooks_wrapper.py"), env=env)
# cleanup_temp step
api.chromium.cleanup_temp()
# chromedriver compile.py step
- api.step("compile", ["python_slave", api.path["build"].join("scripts",
+ api.step("compile", ["python_slave", api.infra_paths['build'].join("scripts",
"slave", "compile.py"), '--solution', 'all.sln', '--project',
'chromium_builder_chromedriver', '--target', 'Release'])
# annotated_steps step
- api.step("annotated_steps", ["python_slave", api.path["build"].join("scripts",
+ api.step("annotated_steps", ["python_slave", api.infra_paths['build'].join("scripts",
"slave", "chromium", "chromedriver_buildbot_run.py"),
'--build-properties=%s' % api.json.dumps(build_properties,
separators=(',', ':')), '--factory-properties={"annotated_script":"chro'+\
@@ -246,16 +247,16 @@ def Linux_steps(api):
env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
'DEPOT_TOOLS_UPDATE': '0', 'GYP_DEFINES':
'branding=Chrome buildtype=Official component=static_library'}
- api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+ api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
"slave", "runhooks_wrapper.py"), env=env)
# cleanup_temp step
api.chromium.cleanup_temp()
# chromedriver compile.py step
- api.python("compile", api.path["build"].join("scripts", "slave",
+ api.python("compile", api.infra_paths['build'].join("scripts", "slave",
"compile.py"), args=['--target', 'Release',
'chromium_builder_chromedriver'])
# annotated_steps step
- api.python("annotated_steps", api.path["build"].join("scripts", "slave",
+ api.python("annotated_steps", api.infra_paths['build'].join("scripts", "slave",
"chromium", "chromedriver_buildbot_run.py"),
args=['--build-properties=%s' % api.json.dumps(build_properties,
separators=(',', ':')), '--factory-properties={"annotated_script":"chro'+\
« no previous file with comments | « scripts/slave/recipes/chromium.py ('k') | scripts/slave/recipes/chromium.chromedriver.recipe_autogen.expected/Linux.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698