summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gclient (renamed from src/.gclient)0
-rw-r--r--.gitignore14
-rw-r--r--.gn (renamed from src/.gn)0
-rw-r--r--.travis.yml3
-rw-r--r--BUILD.gn (renamed from src/BUILD.gn)50
-rw-r--r--README.md7
l---------build (renamed from src/build)0
l---------build_overrides1
l---------buildtools (renamed from src/buildtools)0
-rw-r--r--deno.gni (renamed from src/deno.gni)4
l---------src/build_overrides1
l---------src/third_party/googletest1
l---------src/third_party/jinja21
l---------src/third_party/llvm-build1
l---------src/third_party/markupsafe1
l---------testing (renamed from src/testing)0
l---------third_party/googletest1
l---------third_party/jinja21
l---------third_party/llvm-build1
l---------third_party/markupsafe1
l---------tools/clang (renamed from src/tools/clang)0
-rwxr-xr-xtools/format.sh3
22 files changed, 42 insertions, 49 deletions
diff --git a/src/.gclient b/.gclient
index ec0dd52e5..ec0dd52e5 100644
--- a/src/.gclient
+++ b/.gclient
diff --git a/.gitignore b/.gitignore
index 3d688b872..3e495ea25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
-/src/out/
+/out/
node_modules
-/src/v8/
-/src/tools/protoc_wrapper/
-/src/third_party/protobuf/
-/src/third_party/zlib/
-/src/third_party/rust_crates/libc/
-/src/.gclient_entries
+/v8/
+/tools/protoc_wrapper/
+/third_party/protobuf/
+/third_party/zlib/
+/third_party/rust_crates/libc/
+/.gclient_entries
diff --git a/src/.gn b/.gn
index 1fd465e5c..1fd465e5c 100644
--- a/src/.gn
+++ b/.gn
diff --git a/.travis.yml b/.travis.yml
index 662ed7a14..c73da8c94 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,6 @@ before_install: |
fi
install:
- export PATH=$PATH:$DEPOT_TOOLS_PATH
- - cd src
# Sync dependencies.
# TODO(ry) These sync steps are very terrible and only here temporarily.
# A single deno_deps git submodule should be created which contains V8,
@@ -29,7 +28,7 @@ install:
- curl -sSf https://sh.rustup.rs | sh -s -- -y
- export PATH=$HOME/.cargo/bin:$PATH
- rustc --version
- - (cd js; yarn)
+ - (cd src/js; yarn)
- gclient sync -j2 --no-history
# ccache needs the custom LLVM to be in PATH and other variables.
- export PATH=`pwd`/third_party/llvm-build/Release+Asserts/bin:$PATH
diff --git a/src/BUILD.gn b/BUILD.gn
index 09ce945bb..fcc10b98d 100644
--- a/src/BUILD.gn
+++ b/BUILD.gn
@@ -9,7 +9,7 @@ config("deno_config") {
}
rust_executable("deno") {
- source_root = "main.rs"
+ source_root = "src/main.rs"
rust_deps = [ ":libc" ]
deps = [
":libdeno",
@@ -26,7 +26,7 @@ rust_library("libc") {
executable("mock_main") {
sources = [
- "mock_main.cc",
+ "src/mock_main.cc",
]
deps = [
":libdeno",
@@ -39,9 +39,9 @@ executable("mock_main") {
executable("mock_runtime_test") {
testonly = true
sources = [
- "file_util_test.cc",
- "from_snapshot.cc",
- "mock_runtime_test.cc",
+ "src/file_util_test.cc",
+ "src/from_snapshot.cc",
+ "src/mock_runtime_test.cc",
]
deps = [
":create_snapshot_mock_runtime",
@@ -55,7 +55,7 @@ executable("mock_runtime_test") {
static_library("libdeno") {
complete_static_lib = true
sources = [
- "from_snapshot.cc",
+ "src/from_snapshot.cc",
]
deps = [
":create_snapshot_deno",
@@ -66,11 +66,11 @@ static_library("libdeno") {
v8_source_set("deno_nosnapshot") {
sources = [
- "deno.cc",
- "deno_internal.h",
- "file_util.cc",
- "file_util.h",
- "include/deno.h",
+ "src/deno.cc",
+ "src/deno_internal.h",
+ "src/file_util.cc",
+ "src/file_util.h",
+ "src/include/deno.h",
]
deps = [
"v8:v8_monolith",
@@ -80,7 +80,7 @@ v8_source_set("deno_nosnapshot") {
executable("snapshot_creator") {
sources = [
- "snapshot_creator.cc",
+ "src/snapshot_creator.cc",
]
deps = [
":deno_nosnapshot",
@@ -90,7 +90,7 @@ executable("snapshot_creator") {
proto_library("msg_proto") {
sources = [
- "msg.proto",
+ "src/msg.proto",
]
generate_python = false
}
@@ -98,10 +98,10 @@ proto_library("msg_proto") {
run_node("bundle") {
out_dir = "$target_gen_dir/bundle/"
sources = [
- "js/main.ts",
- "js/msg.pb.d.ts",
- "js/msg.pb.js",
- "js/package.json", # The `browserslist` field controls Babel behavior.
+ "src/js/main.ts",
+ "src/js/msg.pb.d.ts",
+ "src/js/msg.pb.js",
+ "src/js/package.json", # The `browserslist` field controls Babel behavior.
]
outputs = [
out_dir + "main.js",
@@ -116,19 +116,19 @@ run_node("bundle") {
"--no-minify",
"--out-dir",
rebase_path(out_dir, root_build_dir),
- rebase_path("js/main.ts", root_build_dir),
+ rebase_path("src/js/main.ts", root_build_dir),
]
}
# Due to bugs in Parcel we must run TSC independently in order to catch errors.
# https://github.com/parcel-bundler/parcel/issues/954
run_node("run_tsc") {
- main = "js/main.ts"
- tsconfig = "js/tsconfig.json"
+ main = "src/js/main.ts"
+ tsconfig = "src/js/tsconfig.json"
out_dir = "$target_gen_dir/tsc_dist/"
sources = [
- "js/msg.pb.d.ts",
- "js/msg.pb.js",
+ "src/js/msg.pb.d.ts",
+ "src/js/msg.pb.js",
main,
tsconfig,
]
@@ -156,9 +156,9 @@ run_node("run_tsc") {
# be removed at some point. If msg.proto is changed, commit changes to the
# generated JS files. The stamp file is just to make gn work.
action("protobufjs") {
- script = "js/pbjs_hack.py"
+ script = "src/js/pbjs_hack.py"
sources = [
- "msg.proto",
+ "src/msg.proto",
]
outputs = [
"$target_gen_dir/pbjs_hack.stamp",
@@ -180,6 +180,6 @@ create_snapshot("deno") {
# Generates $target_gen_dir/snapshot_mock_runtime.cc
create_snapshot("mock_runtime") {
testonly = true
- js = "js/mock_runtime.js"
+ js = "src/js/mock_runtime.js"
deps = []
}
diff --git a/README.md b/README.md
index 6dc1889b3..25b001cee 100644
--- a/README.md
+++ b/README.md
@@ -71,10 +71,7 @@ You need [yarn](https://yarnpkg.com/lang/en/docs/install/) installed.
You need [rust](https://www.rust-lang.org/en-US/install.html) installed.
-Go to `src/` folder:
-``` bash
-cd src/
-```
+You need [ccache](https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide/Build_Instructions/ccache) installed.
Fetch packages and v8:
``` bash
@@ -83,7 +80,7 @@ gclient sync --no-history
Install the javascript deps.
- (cd js; yarn install)
+ (cd src/js; yarn install)
gn gen out/Debug --args='cc_wrapper="ccache" is_debug=true '
diff --git a/src/build b/build
index 3a238b508..3a238b508 120000
--- a/src/build
+++ b/build
diff --git a/build_overrides b/build_overrides
new file mode 120000
index 000000000..f1aca1a07
--- /dev/null
+++ b/build_overrides
@@ -0,0 +1 @@
+v8/build_overrides \ No newline at end of file
diff --git a/src/buildtools b/buildtools
index c5b1c451c..c5b1c451c 120000
--- a/src/buildtools
+++ b/buildtools
diff --git a/src/deno.gni b/deno.gni
index 66deaa96c..367a7f450 100644
--- a/src/deno.gni
+++ b/deno.gni
@@ -1,7 +1,7 @@
template("run_node") {
action(target_name) {
forward_variables_from(invoker, "*")
- script = "js/run_node.py"
+ script = "src/js/run_node.py"
}
}
@@ -151,7 +151,7 @@ template("rust_executable") {
stdlib_target = target_name + "_stdlib"
rust_crate(stdlib_target) {
crate_type = "staticlib"
- source_root = "empty.rs"
+ source_root = "src/empty.rs"
}
executable(target_name) {
diff --git a/src/build_overrides b/src/build_overrides
deleted file mode 120000
index 06eeb9d4c..000000000
--- a/src/build_overrides
+++ /dev/null
@@ -1 +0,0 @@
-v8/build_overrides/ \ No newline at end of file
diff --git a/src/third_party/googletest b/src/third_party/googletest
deleted file mode 120000
index 21e82410c..000000000
--- a/src/third_party/googletest
+++ /dev/null
@@ -1 +0,0 @@
-../v8/third_party/googletest/ \ No newline at end of file
diff --git a/src/third_party/jinja2 b/src/third_party/jinja2
deleted file mode 120000
index 36528ba75..000000000
--- a/src/third_party/jinja2
+++ /dev/null
@@ -1 +0,0 @@
-../v8/third_party/jinja2/ \ No newline at end of file
diff --git a/src/third_party/llvm-build b/src/third_party/llvm-build
deleted file mode 120000
index 7aebd3382..000000000
--- a/src/third_party/llvm-build
+++ /dev/null
@@ -1 +0,0 @@
-../v8/third_party/llvm-build/ \ No newline at end of file
diff --git a/src/third_party/markupsafe b/src/third_party/markupsafe
deleted file mode 120000
index b0960604b..000000000
--- a/src/third_party/markupsafe
+++ /dev/null
@@ -1 +0,0 @@
-../v8/third_party/markupsafe/ \ No newline at end of file
diff --git a/src/testing b/testing
index ed34f4824..ed34f4824 120000
--- a/src/testing
+++ b/testing
diff --git a/third_party/googletest b/third_party/googletest
new file mode 120000
index 000000000..80cee42e3
--- /dev/null
+++ b/third_party/googletest
@@ -0,0 +1 @@
+../v8/third_party/googletest \ No newline at end of file
diff --git a/third_party/jinja2 b/third_party/jinja2
new file mode 120000
index 000000000..268588bb9
--- /dev/null
+++ b/third_party/jinja2
@@ -0,0 +1 @@
+../v8/third_party/jinja2 \ No newline at end of file
diff --git a/third_party/llvm-build b/third_party/llvm-build
new file mode 120000
index 000000000..d023bbec2
--- /dev/null
+++ b/third_party/llvm-build
@@ -0,0 +1 @@
+../v8/third_party/llvm-build \ No newline at end of file
diff --git a/third_party/markupsafe b/third_party/markupsafe
new file mode 120000
index 000000000..8e9e53c9e
--- /dev/null
+++ b/third_party/markupsafe
@@ -0,0 +1 @@
+../v8/third_party/markupsafe \ No newline at end of file
diff --git a/src/tools/clang b/tools/clang
index 7f66b6537..7f66b6537 120000
--- a/src/tools/clang
+++ b/tools/clang
diff --git a/tools/format.sh b/tools/format.sh
index 0a5967c52..40531748e 100755
--- a/tools/format.sh
+++ b/tools/format.sh
@@ -3,12 +3,9 @@ set -e
cd `dirname "$0"`/..
clang-format -i -style Google src/*.cc src/*.h src/include/*.h
-# TODO(ry) Remove pushd/popd once .gn is moved to root.
-pushd src/
gn format BUILD.gn
gn format deno.gni
gn format .gn
-popd
yapf -i src/js/*.py
prettier --write \
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-02 21:15:55 +0000