diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2020-03-20 21:48:34 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-20 21:48:34 -0400 |
commit | 0adc86f105204b2475126c36dfc10e678f67df56 (patch) | |
tree | ff50bf401208fcb20e8828fbca10433b460fdeb0 /tools | |
parent | 77a44163fb22139a8269eb216014640aaf7a7fa8 (diff) |
Remove DENO_BUILD_MODE and DENO_BUILD_PATH (#4431)
* Remove DENO_BUILD_MODE and DENO_BUILD_PATH
Also remove outdated docs related to ninja/gn.
* fix
* remove parameter to build_mode()
* remove arg parsing from benchmark.py
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/benchmark.py | 13 | ||||
-rw-r--r-- | tools/target_test.py | 2 | ||||
-rw-r--r-- | tools/util.py | 13 |
3 files changed, 8 insertions, 20 deletions
diff --git a/tools/benchmark.py b/tools/benchmark.py index c29ca3e8c..031da263b 100755 --- a/tools/benchmark.py +++ b/tools/benchmark.py @@ -223,15 +223,8 @@ def bundle_benchmark(deno_exe): return sizes -def main(argv): - if len(argv) == 2: - build_dir = sys.argv[1] - elif len(argv) == 1: - build_dir = build_path() - else: - print "Usage: tools/benchmark.py [build_dir]" - sys.exit(1) - +def main(): + build_dir = build_path() sha1 = run_output(["git", "rev-parse", "HEAD"], exit_on_fail=True).out.strip() http_server.spawn() @@ -271,4 +264,4 @@ def main(argv): if __name__ == '__main__': - main(sys.argv) + main() diff --git a/tools/target_test.py b/tools/target_test.py index 2df09f9eb..192f4183a 100644 --- a/tools/target_test.py +++ b/tools/target_test.py @@ -2,7 +2,7 @@ import os import sys from test_util import DenoTestCase, run_tests -from util import build_mode, executable_suffix, tests_path, run, run_output +from util import executable_suffix, tests_path, run, run_output class TestTarget(DenoTestCase): diff --git a/tools/util.py b/tools/util.py index d49af71ce..c4aaa1e5b 100644 --- a/tools/util.py +++ b/tools/util.py @@ -204,21 +204,16 @@ def rmtree(directory): shutil.rmtree(directory, onerror=rm_readonly) -def build_mode(default="debug"): - if "DENO_BUILD_MODE" in os.environ: - return os.environ["DENO_BUILD_MODE"] - elif "--release" in sys.argv: +def build_mode(): + if "--release" in sys.argv: return "release" else: - return default + return "debug" # E.G. "target/debug" def build_path(): - if "DENO_BUILD_PATH" in os.environ: - return os.environ["DENO_BUILD_PATH"] - else: - return os.path.join(root_path, "target", build_mode()) + return os.path.join(root_path, "target", build_mode()) def parse_exit_code(s): |