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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/client.nacl.sdk.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
« no previous file with comments | « scripts/slave/recipes/client.fletch.recipe_autogen.expected/target_dartino_linux_release_arm_dev.json ('k') | scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/linux_sdk_asan_multi.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/client.nacl.sdk.recipe_autogen.py
diff --git a/scripts/slave/recipes/client.nacl.sdk.recipe_autogen.py b/scripts/slave/recipes/client.nacl.sdk.recipe_autogen.py
index 633175cae9151ba0a443ee80dfd1b8264b39d92c..9327a940f74f3829e7c3f2ec5cbe7c4eaa98b925 100644
--- a/scripts/slave/recipes/client.nacl.sdk.recipe_autogen.py
+++ b/scripts/slave/recipes/client.nacl.sdk.recipe_autogen.py
@@ -6,6 +6,7 @@ DEPS = [
'chromium',
'depot_tools/bot_update',
'depot_tools/gclient',
+ 'depot_tools/infra_paths',
'recipe_engine/json',
'recipe_engine/path',
'recipe_engine/properties',
@@ -69,7 +70,7 @@ def linux_sdk_multi_steps(api):
'DEPOT_TOOLS_UPDATE': '0',
'GYP_DEFINES': 'fastbuild=1 component=static_library'}
api.python("gclient runhooks wrapper",
- api.path["build"].join("scripts", "slave",
+ api.infra_paths['build'].join("scripts", "slave",
"runhooks_wrapper.py"),
env=env)
# cleanup_temp step
@@ -78,12 +79,12 @@ def linux_sdk_multi_steps(api):
args = ['--target', 'Release', '--clobber', '--compiler=goma',
'chromium_builder_nacl_sdk']
api.python("compile",
- api.path["build"].join("scripts", "slave", "compile.py"),
+ api.infra_paths['build'].join("scripts", "slave", "compile.py"),
args=args)
# annotated_steps step
api.python(
"annotated_steps",
- api.path["build"].join("scripts", "slave", "chromium",
+ api.infra_paths['build'].join("scripts", "slave", "chromium",
"nacl_sdk_buildbot_run.py"),
args=
['--build-properties=%s' % api.json.dumps(build_properties,
@@ -154,7 +155,7 @@ def mac_sdk_multi_steps(api):
'GYP_DEFINES': 'fastbuild=1 component=static_library',
'LANDMINES_VERBOSE': '1'}
api.python("gclient runhooks wrapper",
- api.path["build"].join("scripts", "slave",
+ api.infra_paths['build'].join("scripts", "slave",
"runhooks_wrapper.py"),
env=env)
# cleanup_temp step
@@ -163,12 +164,12 @@ def mac_sdk_multi_steps(api):
args = ['--target', 'Release', '--clobber', '--build-tool=ninja',
'--compiler=goma-clang', '--', 'chromium_builder_nacl_sdk']
api.python("compile",
- api.path["build"].join("scripts", "slave", "compile.py"),
+ api.infra_paths['build'].join("scripts", "slave", "compile.py"),
args=args)
# annotated_steps step
api.python(
"annotated_steps",
- api.path["build"].join("scripts", "slave", "chromium",
+ api.infra_paths['build'].join("scripts", "slave", "chromium",
"nacl_sdk_buildbot_run.py"),
args=
['--build-properties=%s' % api.json.dumps(build_properties,
@@ -188,7 +189,7 @@ def windows_sdk_multi_steps(api):
# svnkill step; not necessary in recipes
# 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)
@@ -242,7 +243,7 @@ def windows_sdk_multi_steps(api):
'DEPOT_TOOLS_UPDATE': '0',
'GYP_DEFINES': 'fastbuild=1 component=static_library'}
api.python("gclient runhooks wrapper",
- api.path["build"].join("scripts", "slave",
+ api.infra_paths['build'].join("scripts", "slave",
"runhooks_wrapper.py"),
env=env)
# cleanup_temp step
@@ -251,12 +252,12 @@ def windows_sdk_multi_steps(api):
args = ['--solution', 'all.sln', '--project', 'chromium_builder_nacl_sdk',
'--target', 'Release', '--clobber', '--compiler=goma']
api.python("compile",
- api.path["build"].join("scripts", "slave", "compile.py"),
+ api.infra_paths['build'].join("scripts", "slave", "compile.py"),
args=args)
# annotated_steps step
api.python(
"annotated_steps",
- api.path["build"].join("scripts", "slave", "chromium",
+ api.infra_paths['build'].join("scripts", "slave", "chromium",
"nacl_sdk_buildbot_run.py"),
args=
['--build-properties=%s' % api.json.dumps(build_properties,
@@ -300,7 +301,7 @@ def linux_sdk_multirel_steps(api):
'DEPOT_TOOLS_UPDATE': '0',
'GYP_DEFINES': 'fastbuild=1 component=static_library'}
api.python("gclient runhooks wrapper",
- api.path["build"].join("scripts", "slave",
+ api.infra_paths['build'].join("scripts", "slave",
"runhooks_wrapper.py"),
env=env)
# cleanup_temp step
@@ -309,12 +310,12 @@ def linux_sdk_multirel_steps(api):
args = ['--target', 'Release', '--clobber', '--compiler=goma',
'chromium_builder_tests']
api.python("compile",
- api.path["build"].join("scripts", "slave", "compile.py"),
+ api.infra_paths['build'].join("scripts", "slave", "compile.py"),
args=args)
# annotated_steps step
api.python(
"annotated_steps",
- api.path["build"].join("scripts", "slave", "chromium",
+ api.infra_paths['build'].join("scripts", "slave", "chromium",
"nacl_sdk_buildbot_run.py"),
args=
['--build-properties=%s' % api.json.dumps(build_properties,
@@ -334,7 +335,7 @@ def windows_sdk_multirel_steps(api):
# svnkill step; not necessary in recipes
# 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)
@@ -362,7 +363,7 @@ def windows_sdk_multirel_steps(api):
'DEPOT_TOOLS_UPDATE': '0',
'GYP_DEFINES': 'fastbuild=1 component=static_library'}
api.python("gclient runhooks wrapper",
- api.path["build"].join("scripts", "slave",
+ api.infra_paths['build'].join("scripts", "slave",
"runhooks_wrapper.py"),
env=env)
# cleanup_temp step
@@ -371,12 +372,12 @@ def windows_sdk_multirel_steps(api):
args = ['--solution', 'all.sln', '--project', 'chromium_builder_tests',
'--target', 'Release', '--clobber', '--compiler=goma']
api.python("compile",
- api.path["build"].join("scripts", "slave", "compile.py"),
+ api.infra_paths['build'].join("scripts", "slave", "compile.py"),
args=args)
# annotated_steps step
api.python(
"annotated_steps",
- api.path["build"].join("scripts", "slave", "chromium",
+ api.infra_paths['build'].join("scripts", "slave", "chromium",
"nacl_sdk_buildbot_run.py"),
args=
['--build-properties=%s' % api.json.dumps(build_properties,
@@ -421,7 +422,7 @@ def mac_sdk_multirel_steps(api):
'GYP_DEFINES': 'fastbuild=1 component=static_library',
'CHROMIUM_GYP_SYNTAX_CHECK': '1'}
api.python("gclient runhooks wrapper",
- api.path["build"].join("scripts", "slave",
+ api.infra_paths['build'].join("scripts", "slave",
"runhooks_wrapper.py"),
env=env)
# cleanup_temp step
@@ -430,12 +431,12 @@ def mac_sdk_multirel_steps(api):
args = ['--target', 'Release', '--clobber', '--build-tool=ninja',
'--compiler=goma-clang', '--', 'chromium_builder_tests']
api.python("compile",
- api.path["build"].join("scripts", "slave", "compile.py"),
+ api.infra_paths['build'].join("scripts", "slave", "compile.py"),
args=args)
# annotated_steps step
api.python(
"annotated_steps",
- api.path["build"].join("scripts", "slave", "chromium",
+ api.infra_paths['build'].join("scripts", "slave", "chromium",
"nacl_sdk_buildbot_run.py"),
args=
['--build-properties=%s' % api.json.dumps(build_properties,
« no previous file with comments | « scripts/slave/recipes/client.fletch.recipe_autogen.expected/target_dartino_linux_release_arm_dev.json ('k') | scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/linux_sdk_asan_multi.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698