| Index: scripts/slave/recipes/client.fletch.recipe_autogen.py
|
| diff --git a/scripts/slave/recipes/client.fletch.recipe_autogen.py b/scripts/slave/recipes/client.fletch.recipe_autogen.py
|
| index 092ff481a3848efdfa5f5598d77d22b540cec3fd..5eb49c66e6b41b7e4873cb88be78cbe379e3f2ee 100644
|
| --- a/scripts/slave/recipes/client.fletch.recipe_autogen.py
|
| +++ b/scripts/slave/recipes/client.fletch.recipe_autogen.py
|
| @@ -5,6 +5,7 @@
|
| DEPS = [
|
| 'depot_tools/bot_update',
|
| 'depot_tools/gclient',
|
| + 'depot_tools/infra_paths',
|
| 'recipe_engine/path',
|
| 'recipe_engine/properties',
|
| 'recipe_engine/python',
|
| @@ -30,7 +31,7 @@ def target_dartino_linux_debug_arm_dev_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -70,7 +71,7 @@ def dartino_mac_debug_asan_x86_dev_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -106,7 +107,7 @@ def target_dartino_linux_release_arm_dev_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -145,7 +146,7 @@ def dartino_lk_debug_arm_qemu_dev_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -184,7 +185,7 @@ def dartino_linux_release_asan_x86_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -223,7 +224,7 @@ def dartino_mac_release_x86_dev_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -259,7 +260,7 @@ def cross_dartino_linux_arm_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -302,7 +303,7 @@ def dartino_mac_release_asan_x86_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -338,7 +339,7 @@ def cross_dartino_linux_arm_dev_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -381,7 +382,7 @@ def dartino_free_rtos_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -420,7 +421,7 @@ def dartino_mac_release_x64_sdk_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -456,7 +457,7 @@ def dartino_free_rtos_dev_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -495,7 +496,7 @@ def dartino_mac_debug_asan_x86_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -531,7 +532,7 @@ def dartino_mac_debug_x86_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -567,7 +568,7 @@ def target_dartino_linux_debug_arm_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -593,7 +594,7 @@ def dartino_win_debug_x86_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)
|
| @@ -610,7 +611,7 @@ def dartino_win_debug_x86_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -646,7 +647,7 @@ def dartino_linux_release_x86_dev_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -685,7 +686,7 @@ def dartino_mac_debug_x86_dev_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -721,7 +722,7 @@ def dartino_linux_release_x64_sdk_dev_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -763,7 +764,7 @@ def dartino_linux_debug_asan_x86_dev_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -802,7 +803,7 @@ def dartino_linux_debug_asan_x86_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -841,7 +842,7 @@ def dartino_mac_release_asan_x86_dev_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -877,7 +878,7 @@ def target_dartino_linux_release_arm_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -916,7 +917,7 @@ def dartino_mac_release_x86_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -952,7 +953,7 @@ def dartino_linux_release_x64_sdk_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -994,7 +995,7 @@ def dartino_lk_debug_arm_qemu_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -1033,7 +1034,7 @@ def dartino_mac_release_x64_sdk_dev_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -1069,7 +1070,7 @@ def dartino_linux_release_asan_x86_dev_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -1108,7 +1109,7 @@ def dartino_linux_debug_x86_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -1147,7 +1148,7 @@ def dartino_linux_release_x86_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -1186,7 +1187,7 @@ def dartino_linux_debug_x86_dev_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
| @@ -1212,7 +1213,7 @@ def dartino_win_debug_x86_dev_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)
|
| @@ -1229,7 +1230,7 @@ def dartino_win_debug_x86_dev_steps(api):
|
| # gclient runhooks wrapper step
|
| env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
|
| 'DEPOT_TOOLS_UPDATE': '0'}
|
| - 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)
|
| # taskkill step
|
| api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
|
|
|