| Index: scripts/slave/recipes/infra/publish_tarball.expected/basic.json
|
| diff --git a/scripts/slave/recipes/infra/publish_tarball.expected/basic.json b/scripts/slave/recipes/infra/publish_tarball.expected/basic.json
|
| index 49413361e3c5e2a7d66dbca9a242ec74e3cccda9..942cd3785f321db7edaca90451112d5bd9e57f46 100644
|
| --- a/scripts/slave/recipes/infra/publish_tarball.expected/basic.json
|
| +++ b/scripts/slave/recipes/infra/publish_tarball.expected/basic.json
|
| @@ -5,12 +5,11 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "ls",
|
| "gs://chromium-browser-official/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil ls",
|
| "stdout": "/path/to/tmp/"
|
| },
|
| @@ -26,13 +25,13 @@
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| - "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",
|
| + "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",
|
| "--root",
|
| "src",
|
| "--revision_mapping_file",
|
| "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
|
| "--git-cache-dir",
|
| - "[GIT_CACHE]",
|
| + "[ROOT]/b/build/slave/cache_dir",
|
| "--output_json",
|
| "/path/to/tmp/json",
|
| "--revision",
|
| @@ -41,7 +40,6 @@
|
| "--output_manifest",
|
| "--with_branch_heads"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -119,7 +117,7 @@
|
| "clean",
|
| "-dffx"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[CWD]/src",
|
| "name": "git clean"
|
| },
|
| {
|
| @@ -131,7 +129,7 @@
|
| "-D",
|
| "--nohooks"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[CWD]/src",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -140,9 +138,8 @@
|
| {
|
| "cmd": [
|
| "touch",
|
| - "[SLAVE_BUILD]/src/chrome/test/data/webui/i18n_process_css_test.html"
|
| + "[CWD]/src/chrome/test/data/webui/i18n_process_css_test.html"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "touch chrome/test/data/webui/i18n_process_css_test.html"
|
| },
|
| {
|
| @@ -155,9 +152,9 @@
|
| "--verbose",
|
| "--progress",
|
| "--src-dir",
|
| - "[SLAVE_BUILD]/src"
|
| + "[CWD]/src"
|
| ],
|
| - "cwd": "[TMP_BASE]/export_tarball_tmp_1",
|
| + "cwd": "[TMP]/export_tarball_tmp_1",
|
| "name": "export_tarball"
|
| },
|
| {
|
| @@ -166,15 +163,14 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "cp",
|
| "-a",
|
| "public-read",
|
| - "[TMP_BASE]/export_tarball_tmp_1/chromium-38.0.2125.122.tar.xz",
|
| + "[TMP]/export_tarball_tmp_1/chromium-38.0.2125.122.tar.xz",
|
| "gs://chromium-browser-official/chromium-38.0.2125.122.tar.xz"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil upload chromium-38.0.2125.122.tar.xz",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-browser-official/chromium-38.0.2125.122.tar.xz@@@"
|
| @@ -185,10 +181,9 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::chromium]/resources/generate_hashes.py",
|
| - "[TMP_BASE]/export_tarball_tmp_1/chromium-38.0.2125.122.tar.xz",
|
| + "[TMP]/export_tarball_tmp_1/chromium-38.0.2125.122.tar.xz",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "generate_hashes"
|
| },
|
| {
|
| @@ -197,7 +192,7 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "cp",
|
| "-a",
|
| @@ -205,7 +200,6 @@
|
| "md5 164ebd6889588da166a52ca0d57b9004 bash",
|
| "gs://chromium-browser-official/chromium-38.0.2125.122.tar.xz.hashes"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil upload chromium-38.0.2125.122.tar.xz.hashes",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-browser-official/chromium-38.0.2125.122.tar.xz.hashes@@@"
|
| @@ -216,9 +210,8 @@
|
| "python",
|
| "-u",
|
| "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| - "[TMP_BASE]/export_tarball_tmp_1"
|
| + "[TMP]/export_tarball_tmp_1"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree temp dir",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -241,9 +234,9 @@
|
| "--verbose",
|
| "--progress",
|
| "--src-dir",
|
| - "[SLAVE_BUILD]/src"
|
| + "[CWD]/src"
|
| ],
|
| - "cwd": "[TMP_BASE]/export_tarball_tmp_2",
|
| + "cwd": "[TMP]/export_tarball_tmp_2",
|
| "name": "export_tarball (2)"
|
| },
|
| {
|
| @@ -252,15 +245,14 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "cp",
|
| "-a",
|
| "public-read",
|
| - "[TMP_BASE]/export_tarball_tmp_2/chromium-38.0.2125.122.tar.xz",
|
| + "[TMP]/export_tarball_tmp_2/chromium-38.0.2125.122.tar.xz",
|
| "gs://chromium-browser-official/chromium-38.0.2125.122-testdata.tar.xz"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil upload chromium-38.0.2125.122-testdata.tar.xz",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-browser-official/chromium-38.0.2125.122-testdata.tar.xz@@@"
|
| @@ -271,10 +263,9 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::chromium]/resources/generate_hashes.py",
|
| - "[TMP_BASE]/export_tarball_tmp_2/chromium-38.0.2125.122.tar.xz",
|
| + "[TMP]/export_tarball_tmp_2/chromium-38.0.2125.122.tar.xz",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "generate_hashes (2)"
|
| },
|
| {
|
| @@ -283,7 +274,7 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "cp",
|
| "-a",
|
| @@ -291,7 +282,6 @@
|
| "md5 164ebd6889588da166a52ca0d57b9004 bash",
|
| "gs://chromium-browser-official/chromium-38.0.2125.122-testdata.tar.xz.hashes"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil upload chromium-38.0.2125.122-testdata.tar.xz.hashes",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-browser-official/chromium-38.0.2125.122-testdata.tar.xz.hashes@@@"
|
| @@ -302,9 +292,8 @@
|
| "python",
|
| "-u",
|
| "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| - "[TMP_BASE]/export_tarball_tmp_2"
|
| + "[TMP]/export_tarball_tmp_2"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree temp dir (2)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -322,17 +311,16 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n",
|
| - "[SLAVE_BUILD]/src",
|
| - "[TMP_BASE]/tmp_tmp_3/src",
|
| + "[CWD]/src",
|
| + "[TMP]/tmp_tmp_3/src",
|
| "1"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "copytree"
|
| },
|
| {
|
| "cmd": [
|
| "find",
|
| - "[TMP_BASE]/tmp_tmp_3/src/android_webview",
|
| + "[TMP]/tmp_tmp_3/src/android_webview",
|
| "-type",
|
| "f",
|
| "!",
|
| @@ -349,13 +337,12 @@
|
| "*.grd*",
|
| "-delete"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "prune android_webview"
|
| },
|
| {
|
| "cmd": [
|
| "find",
|
| - "[TMP_BASE]/tmp_tmp_3/src/buildtools/third_party/libc++",
|
| + "[TMP]/tmp_tmp_3/src/buildtools/third_party/libc++",
|
| "-type",
|
| "f",
|
| "!",
|
| @@ -372,13 +359,12 @@
|
| "*.grd*",
|
| "-delete"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "prune buildtools/third_party/libc++"
|
| },
|
| {
|
| "cmd": [
|
| "find",
|
| - "[TMP_BASE]/tmp_tmp_3/src/chrome/android",
|
| + "[TMP]/tmp_tmp_3/src/chrome/android",
|
| "-type",
|
| "f",
|
| "!",
|
| @@ -395,13 +381,12 @@
|
| "*.grd*",
|
| "-delete"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "prune chrome/android"
|
| },
|
| {
|
| "cmd": [
|
| "find",
|
| - "[TMP_BASE]/tmp_tmp_3/src/chromecast",
|
| + "[TMP]/tmp_tmp_3/src/chromecast",
|
| "-type",
|
| "f",
|
| "!",
|
| @@ -418,13 +403,12 @@
|
| "*.grd*",
|
| "-delete"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "prune chromecast"
|
| },
|
| {
|
| "cmd": [
|
| "find",
|
| - "[TMP_BASE]/tmp_tmp_3/src/ios",
|
| + "[TMP]/tmp_tmp_3/src/ios",
|
| "-type",
|
| "f",
|
| "!",
|
| @@ -441,13 +425,12 @@
|
| "*.grd*",
|
| "-delete"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "prune ios"
|
| },
|
| {
|
| "cmd": [
|
| "find",
|
| - "[TMP_BASE]/tmp_tmp_3/src/native_client",
|
| + "[TMP]/tmp_tmp_3/src/native_client",
|
| "-type",
|
| "f",
|
| "!",
|
| @@ -464,13 +447,12 @@
|
| "*.grd*",
|
| "-delete"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "prune native_client"
|
| },
|
| {
|
| "cmd": [
|
| "find",
|
| - "[TMP_BASE]/tmp_tmp_3/src/native_client_sdk",
|
| + "[TMP]/tmp_tmp_3/src/native_client_sdk",
|
| "-type",
|
| "f",
|
| "!",
|
| @@ -487,13 +469,12 @@
|
| "*.grd*",
|
| "-delete"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "prune native_client_sdk"
|
| },
|
| {
|
| "cmd": [
|
| "find",
|
| - "[TMP_BASE]/tmp_tmp_3/src/third_party/WebKit/ManualTests",
|
| + "[TMP]/tmp_tmp_3/src/third_party/WebKit/ManualTests",
|
| "-type",
|
| "f",
|
| "!",
|
| @@ -510,13 +491,12 @@
|
| "*.grd*",
|
| "-delete"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "prune third_party/WebKit/ManualTests"
|
| },
|
| {
|
| "cmd": [
|
| "find",
|
| - "[TMP_BASE]/tmp_tmp_3/src/third_party/WebKit/PerformanceTests",
|
| + "[TMP]/tmp_tmp_3/src/third_party/WebKit/PerformanceTests",
|
| "-type",
|
| "f",
|
| "!",
|
| @@ -533,13 +513,12 @@
|
| "*.grd*",
|
| "-delete"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "prune third_party/WebKit/PerformanceTests"
|
| },
|
| {
|
| "cmd": [
|
| "find",
|
| - "[TMP_BASE]/tmp_tmp_3/src/third_party/android_platform",
|
| + "[TMP]/tmp_tmp_3/src/third_party/android_platform",
|
| "-type",
|
| "f",
|
| "!",
|
| @@ -556,13 +535,12 @@
|
| "*.grd*",
|
| "-delete"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "prune third_party/android_platform"
|
| },
|
| {
|
| "cmd": [
|
| "find",
|
| - "[TMP_BASE]/tmp_tmp_3/src/third_party/chromite",
|
| + "[TMP]/tmp_tmp_3/src/third_party/chromite",
|
| "-type",
|
| "f",
|
| "!",
|
| @@ -579,13 +557,12 @@
|
| "*.grd*",
|
| "-delete"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "prune third_party/chromite"
|
| },
|
| {
|
| "cmd": [
|
| "find",
|
| - "[TMP_BASE]/tmp_tmp_3/src/third_party/closure_compiler",
|
| + "[TMP]/tmp_tmp_3/src/third_party/closure_compiler",
|
| "-type",
|
| "f",
|
| "!",
|
| @@ -602,13 +579,12 @@
|
| "*.grd*",
|
| "-delete"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "prune third_party/closure_compiler"
|
| },
|
| {
|
| "cmd": [
|
| "find",
|
| - "[TMP_BASE]/tmp_tmp_3/src/third_party/freetype2",
|
| + "[TMP]/tmp_tmp_3/src/third_party/freetype2",
|
| "-type",
|
| "f",
|
| "!",
|
| @@ -625,13 +601,12 @@
|
| "*.grd*",
|
| "-delete"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "prune third_party/freetype2"
|
| },
|
| {
|
| "cmd": [
|
| "find",
|
| - "[TMP_BASE]/tmp_tmp_3/src/third_party/icu",
|
| + "[TMP]/tmp_tmp_3/src/third_party/icu",
|
| "-type",
|
| "f",
|
| "!",
|
| @@ -648,13 +623,12 @@
|
| "*.grd*",
|
| "-delete"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "prune third_party/icu"
|
| },
|
| {
|
| "cmd": [
|
| "find",
|
| - "[TMP_BASE]/tmp_tmp_3/src/third_party/libjpeg_turbo",
|
| + "[TMP]/tmp_tmp_3/src/third_party/libjpeg_turbo",
|
| "-type",
|
| "f",
|
| "!",
|
| @@ -671,13 +645,12 @@
|
| "*.grd*",
|
| "-delete"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "prune third_party/libjpeg_turbo"
|
| },
|
| {
|
| "cmd": [
|
| "find",
|
| - "[TMP_BASE]/tmp_tmp_3/src/third_party/libxml/src",
|
| + "[TMP]/tmp_tmp_3/src/third_party/libxml/src",
|
| "-type",
|
| "f",
|
| "!",
|
| @@ -694,13 +667,12 @@
|
| "*.grd*",
|
| "-delete"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "prune third_party/libxml/src"
|
| },
|
| {
|
| "cmd": [
|
| "find",
|
| - "[TMP_BASE]/tmp_tmp_3/src/third_party/snappy",
|
| + "[TMP]/tmp_tmp_3/src/third_party/snappy",
|
| "-type",
|
| "f",
|
| "!",
|
| @@ -717,13 +689,12 @@
|
| "*.grd*",
|
| "-delete"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "prune third_party/snappy"
|
| },
|
| {
|
| "cmd": [
|
| "find",
|
| - "[TMP_BASE]/tmp_tmp_3/src/third_party/webgl",
|
| + "[TMP]/tmp_tmp_3/src/third_party/webgl",
|
| "-type",
|
| "f",
|
| "!",
|
| @@ -740,13 +711,12 @@
|
| "*.grd*",
|
| "-delete"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "prune third_party/webgl"
|
| },
|
| {
|
| "cmd": [
|
| "find",
|
| - "[TMP_BASE]/tmp_tmp_3/src/third_party/yasm",
|
| + "[TMP]/tmp_tmp_3/src/third_party/yasm",
|
| "-type",
|
| "f",
|
| "!",
|
| @@ -763,13 +733,12 @@
|
| "*.grd*",
|
| "-delete"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "prune third_party/yasm"
|
| },
|
| {
|
| "cmd": [
|
| "find",
|
| - "[TMP_BASE]/tmp_tmp_3/src/tools/win",
|
| + "[TMP]/tmp_tmp_3/src/tools/win",
|
| "-type",
|
| "f",
|
| "!",
|
| @@ -786,20 +755,18 @@
|
| "*.grd*",
|
| "-delete"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "prune tools/win"
|
| },
|
| {
|
| "cmd": [
|
| "find",
|
| - "[TMP_BASE]/tmp_tmp_3/src",
|
| + "[TMP]/tmp_tmp_3/src",
|
| "-depth",
|
| "-type",
|
| "d",
|
| "-empty",
|
| "-delete"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "prune empty directories"
|
| },
|
| {
|
| @@ -812,9 +779,9 @@
|
| "--verbose",
|
| "--progress",
|
| "--src-dir",
|
| - "[TMP_BASE]/tmp_tmp_3/src"
|
| + "[TMP]/tmp_tmp_3/src"
|
| ],
|
| - "cwd": "[TMP_BASE]/export_tarball_tmp_4",
|
| + "cwd": "[TMP]/export_tarball_tmp_4",
|
| "name": "export_tarball (3)"
|
| },
|
| {
|
| @@ -823,15 +790,14 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "cp",
|
| "-a",
|
| "public-read",
|
| - "[TMP_BASE]/export_tarball_tmp_4/chromium-38.0.2125.122.tar.xz",
|
| + "[TMP]/export_tarball_tmp_4/chromium-38.0.2125.122.tar.xz",
|
| "gs://chromium-browser-official/chromium-38.0.2125.122-lite.tar.xz"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil upload chromium-38.0.2125.122-lite.tar.xz",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-browser-official/chromium-38.0.2125.122-lite.tar.xz@@@"
|
| @@ -842,10 +808,9 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::chromium]/resources/generate_hashes.py",
|
| - "[TMP_BASE]/export_tarball_tmp_4/chromium-38.0.2125.122.tar.xz",
|
| + "[TMP]/export_tarball_tmp_4/chromium-38.0.2125.122.tar.xz",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "generate_hashes (3)"
|
| },
|
| {
|
| @@ -854,7 +819,7 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "cp",
|
| "-a",
|
| @@ -862,7 +827,6 @@
|
| "md5 164ebd6889588da166a52ca0d57b9004 bash",
|
| "gs://chromium-browser-official/chromium-38.0.2125.122-lite.tar.xz.hashes"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil upload chromium-38.0.2125.122-lite.tar.xz.hashes",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-browser-official/chromium-38.0.2125.122-lite.tar.xz.hashes@@@"
|
| @@ -873,9 +837,8 @@
|
| "python",
|
| "-u",
|
| "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| - "[TMP_BASE]/export_tarball_tmp_4"
|
| + "[TMP]/export_tarball_tmp_4"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree temp dir (3)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -893,9 +856,8 @@
|
| "python",
|
| "-u",
|
| "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| - "[TMP_BASE]/tmp_tmp_3"
|
| + "[TMP]/tmp_tmp_3"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree temp dir (4)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -913,24 +875,22 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n",
|
| - "[SLAVE_BUILD]/src",
|
| - "[TMP_BASE]/tmp_tmp_5/src",
|
| + "[CWD]/src",
|
| + "[TMP]/tmp_tmp_5/src",
|
| "1"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "copytree (2)"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[TMP_BASE]/tmp_tmp_5/src/native_client/toolchain_build/toolchain_build_pnacl.py",
|
| + "[TMP]/tmp_tmp_5/src/native_client/toolchain_build/toolchain_build_pnacl.py",
|
| "--verbose",
|
| "--sync",
|
| "--sync-only",
|
| "--disable-git-cache"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "download pnacl toolchain dependencies"
|
| },
|
| {
|
| @@ -943,9 +903,9 @@
|
| "--verbose",
|
| "--progress",
|
| "--src-dir",
|
| - "[TMP_BASE]/tmp_tmp_5/src"
|
| + "[TMP]/tmp_tmp_5/src"
|
| ],
|
| - "cwd": "[TMP_BASE]/export_tarball_tmp_6",
|
| + "cwd": "[TMP]/export_tarball_tmp_6",
|
| "name": "export_tarball (4)"
|
| },
|
| {
|
| @@ -954,15 +914,14 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "cp",
|
| "-a",
|
| "public-read",
|
| - "[TMP_BASE]/export_tarball_tmp_6/chromium-38.0.2125.122.tar.xz",
|
| + "[TMP]/export_tarball_tmp_6/chromium-38.0.2125.122.tar.xz",
|
| "gs://chromium-browser-official/chromium-38.0.2125.122-nacl.tar.xz"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil upload chromium-38.0.2125.122-nacl.tar.xz",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-browser-official/chromium-38.0.2125.122-nacl.tar.xz@@@"
|
| @@ -973,10 +932,9 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::chromium]/resources/generate_hashes.py",
|
| - "[TMP_BASE]/export_tarball_tmp_6/chromium-38.0.2125.122.tar.xz",
|
| + "[TMP]/export_tarball_tmp_6/chromium-38.0.2125.122.tar.xz",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "generate_hashes (4)"
|
| },
|
| {
|
| @@ -985,7 +943,7 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "cp",
|
| "-a",
|
| @@ -993,7 +951,6 @@
|
| "md5 164ebd6889588da166a52ca0d57b9004 bash",
|
| "gs://chromium-browser-official/chromium-38.0.2125.122-nacl.tar.xz.hashes"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil upload chromium-38.0.2125.122-nacl.tar.xz.hashes",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-browser-official/chromium-38.0.2125.122-nacl.tar.xz.hashes@@@"
|
| @@ -1004,9 +961,8 @@
|
| "python",
|
| "-u",
|
| "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| - "[TMP_BASE]/export_tarball_tmp_6"
|
| + "[TMP]/export_tarball_tmp_6"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree temp dir (5)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -1024,9 +980,8 @@
|
| "python",
|
| "-u",
|
| "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| - "[TMP_BASE]/tmp_tmp_5"
|
| + "[TMP]/tmp_tmp_5"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree temp dir (6)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
|
|