diff --git a/Docs.md b/Docs.md index 76e819167e..feda020276 100644 --- a/Docs.md +++ b/Docs.md @@ -93,14 +93,14 @@ export DENO_BUILD_MODE=release # Build deno and V8's d8. ./tools/build.py d8 deno # Start the program we want to benchmark with --prof -./out/release/deno tests/http_bench.ts --allow-net --prof & +./target/release/deno tests/http_bench.ts --allow-net --prof & # Exercise it. third_party/wrk/linux/wrk http://localhost:4500/ kill `pgrep deno` # When supplying --prof, V8 will write a file in the current directory that # looks like this isolate-0x7fad98242400-v8.log # To examine this file: -D8_PATH=out/release/ ./third_party/v8/tools/linux-tick-processor +D8_PATH=target/release/ ./third_party/v8/tools/linux-tick-processor isolate-0x7fad98242400-v8.log ``` @@ -136,7 +136,7 @@ submodule. However, you need to install separately: ./tools/build.py # Run. - ./out/debug/deno tests/002_hello.ts + ./target/debug/deno tests/002_hello.ts # Test. ./tools/test.py @@ -147,22 +147,22 @@ submodule. However, you need to install separately: Other useful commands: # Call ninja manually. - ./third_party/depot_tools/ninja -C out/debug + ./third_party/depot_tools/ninja -C target/debug # Build a release binary. DENO_BUILD_MODE=release ./tools/build.py :deno # List executable targets. - ./third_party/depot_tools/gn ls out/debug //:* --as=output --type=executable + ./third_party/depot_tools/gn ls target/debug //:* --as=output --type=executable # List build configuation. - ./third_party/depot_tools/gn args out/debug/ --list + ./third_party/depot_tools/gn args target/debug/ --list # Edit build configuration. - ./third_party/depot_tools/gn args out/debug/ + ./third_party/depot_tools/gn args target/debug/ # Describe a target. - ./third_party/depot_tools/gn desc out/debug/ :deno + ./third_party/depot_tools/gn desc target/debug/ :deno ./third_party/depot_tools/gn help # Update third_party modules diff --git a/README.md b/README.md index 23b2be778a..fb7c5c51aa 100644 --- a/README.md +++ b/README.md @@ -33,10 +33,10 @@ - Single executable: ``` - > ls -lh out/release/deno - -rwxr-xr-x 1 rld staff 48M Aug 2 13:24 out/release/deno - > otool -L out/release/deno - out/release/deno: + > ls -lh target/release/deno + -rwxr-xr-x 1 rld staff 48M Aug 2 13:24 target/release/deno + > otool -L target/release/deno + target/release/deno: /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1252.50.4) /usr/lib/libresolv.9.dylib (compatibility version 1.0.0, current version 1.0.0) /System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 58286.51.6) diff --git a/js/unit_tests.ts b/js/unit_tests.ts index 69a14185cf..57bd554d55 100644 --- a/js/unit_tests.ts +++ b/js/unit_tests.ts @@ -1,7 +1,7 @@ // Copyright 2018 the Deno authors. All rights reserved. MIT license. // This test is executed as part of tools/test.py -// But it can also be run manually: ./out/debug/deno js/unit_tests.ts +// But it can also be run manually: ./target/debug/deno js/unit_tests.ts import "../website/app_test.js"; import "./blob_test.ts"; import "./buffer_test.ts"; diff --git a/tools/deno_dir_test.py b/tools/deno_dir_test.py index 769af6dca6..bb07b75445 100755 --- a/tools/deno_dir_test.py +++ b/tools/deno_dir_test.py @@ -42,7 +42,7 @@ def run_deno(deno_exe, deno_dir=None): def main(argv): if len(sys.argv) != 3: - print "Usage ./tools/deno_dir_test.py out/debug/deno out/debug/.deno_dir" + print "Usage ./tools/deno_dir_test.py target/debug/deno target/debug/.deno_dir" sys.exit(1) deno_dir_test(argv[1], argv[2]) diff --git a/tools/http_benchmark.py b/tools/http_benchmark.py index a2148ba457..f94144eac7 100755 --- a/tools/http_benchmark.py +++ b/tools/http_benchmark.py @@ -62,6 +62,6 @@ def run(server_cmd): if __name__ == '__main__': if len(sys.argv) < 2: - print "Usage ./tools/http_benchmark.py out/debug/deno" + print "Usage ./tools/http_benchmark.py target/debug/deno" sys.exit(1) deno_http_benchmark(sys.argv[1]) diff --git a/tools/throughput_benchmark.py b/tools/throughput_benchmark.py index b9fdc8a358..457f50bae2 100755 --- a/tools/throughput_benchmark.py +++ b/tools/throughput_benchmark.py @@ -48,7 +48,7 @@ if __name__ == '__main__': deno_exe = sys.argv[1] megs = int(sys.argv[2]) if not deno_exe or not megs: - print "Usage ./tools/throughput_benchmark.py out/debug/deno 100" + print "Usage ./tools/throughput_benchmark.py target/debug/deno 100" sys.exit(1) secs = tcp(sys.argv[1], megs) print secs, "seconds" diff --git a/tools/unit_tests.py b/tools/unit_tests.py index f357aaccdd..9682aec89a 100755 --- a/tools/unit_tests.py +++ b/tools/unit_tests.py @@ -59,6 +59,6 @@ def unit_tests(deno_exe): if __name__ == '__main__': if len(sys.argv) < 2: - print "Usage ./tools/unit_tests.py out/debug/deno" + print "Usage ./tools/unit_tests.py target/debug/deno" sys.exit(1) unit_tests(sys.argv[1]) diff --git a/tools/util.py b/tools/util.py index dd80ab4bd2..8c126bd83c 100644 --- a/tools/util.py +++ b/tools/util.py @@ -182,12 +182,12 @@ def build_mode(default="debug"): return default -# E.G. "out/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, "out", build_mode()) + return os.path.join(root_path, "target", build_mode()) # Returns True if the expected matches the actual output, allowing variation diff --git a/tsconfig.json b/tsconfig.json index c67223f530..b8db5d062e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,7 +11,7 @@ "noLib": true, "noUnusedLocals": true, "paths": { - "*": ["*", "out/debug/*", "out/default/*", "out/release/*"] + "*": ["*", "target/debug/*", "target/release/*"] }, "preserveConstEnums": true, "pretty": true,