Commit 5955aca
tools: remove deps/zlib/GN-scraper.py
Gyp appends search path for `pymod_do_main`, so `GN-scraper.py` in
`v8_gypfiles` always takes precedence over `deps/zlib/GN-scraper.py`,
and `deps/zlib/GN-scraper.py` is never loaded.
PR-URL: #57238
Refs: https://github.com/nodejs/gyp-next/blob/46fc91f1fa0aeb72a2581ea6996f5e37f7a2e9ce/pylib/gyp/input.py#L935
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>1 parent 0f8cd32 commit 5955aca
4 files changed
Lines changed: 11 additions & 31 deletions
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -14,7 +14,7 @@ echo "Comparing latest upstream with current revision" | |||
| 14 | 14 | ||
| 15 | 15 | git fetch https://chromium.googlesource.com/chromium/src/third_party/zlib.git HEAD | |
| 16 | 16 | ||
| 17 | - # Revert zconf.h changes before checking diff | ||
| 17 | + # Revert zconf.h changes before checking diff | ||
| 18 | 18 | perl -i -pe 's|^//#include "chromeconf.h"|#include "chromeconf.h"|' "$DEPS_DIR/zlib/zconf.h" | |
| 19 | 19 | git stash -- "$DEPS_DIR/zlib/zconf.h" | |
| 20 | 20 | ||
@@ -63,13 +63,13 @@ gzip -dc "$ZLIB_TARBALL" | tar xf - -C zlib/ | |||
| 63 | 63 | ||
| 64 | 64 | rm "$ZLIB_TARBALL" | |
| 65 | 65 | ||
| 66 | - cp "$DEPS_DIR/zlib/zlib.gyp" "$DEPS_DIR/zlib/GN-scraper.py" "$DEPS_DIR/zlib/win32/zlib.def" "$DEPS_DIR" | ||
| 66 | + cp "$DEPS_DIR/zlib/zlib.gyp" "$DEPS_DIR/zlib/win32/zlib.def" "$DEPS_DIR" | ||
| 67 | 67 | ||
| 68 | 68 | rm -rf "$DEPS_DIR/zlib" zlib/.git | |
| 69 | 69 | ||
| 70 | 70 | mv zlib "$DEPS_DIR/" | |
| 71 | 71 | ||
| 72 | - mv "$DEPS_DIR/zlib.gyp" "$DEPS_DIR/GN-scraper.py" "$DEPS_DIR/zlib/" | ||
| 72 | + mv "$DEPS_DIR/zlib.gyp" "$DEPS_DIR/zlib/" | ||
| 73 | 73 | ||
| 74 | 74 | mkdir "$DEPS_DIR/zlib/win32" | |
| 75 | 75 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -9,6 +9,10 @@ | |||
| 9 | 9 | sys.path.insert(0, os.path.join(node_root, 'tools', 'gyp', 'pylib')) | |
| 10 | 10 | import gyp | |
| 11 | 11 | ||
| 12 | + # Add search path for `pymod_do_main` first to avoid depending on | ||
| 13 | + # load order of gyp files. | ||
| 14 | + sys.path.insert(0, os.path.join(node_root, 'tools', 'v8_gypfiles')) | ||
| 15 | + | ||
| 12 | 16 | # Directory within which we want all generated files (including Makefiles) | |
| 13 | 17 | # to be written. | |
| 14 | 18 | output_dir = os.path.join(os.path.abspath(node_root), 'out') | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -2,6 +2,7 @@ | |||
| 2 | 2 | # Use of this source code is governed by an MIT-style license. | |
| 3 | 3 | import re | |
| 4 | 4 | import os | |
| 5 | + import sys | ||
| 5 | 6 | ||
| 6 | 7 | PLAIN_SOURCE_RE = re.compile(r'\s*"([^/$].+)"\s*') | |
| 7 | 8 | def DoMain(args): | |
@@ -22,3 +23,6 @@ def DoMain(args): | |||
| 22 | 23 | # always use `/` since GYP will process paths further downstream | |
| 23 | 24 | rel_files = ['"%s/%s"' % (src_root, f) for f in files] | |
| 24 | 25 | return ' '.join(rel_files) | |
| 26 | + | ||
| 27 | + if __name__ == '__main__': | ||
| 28 | + print(DoMain(sys.argv[1:])) | ||
0 commit comments