diff --git a/.travis.yml b/.travis.yml index 0f9b33e67b..8a9d35cdec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ branches: cache: ccache: true directories: - - deno2/js/node_modules/ + - src/js/node_modules/ - $DEPOT_TOOLS_PATH - $BUILD_PATH env: @@ -19,7 +19,7 @@ before_install: | fi install: - export PATH=$PATH:$DEPOT_TOOLS_PATH - - cd deno2 + - 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, diff --git a/README.md b/README.md index f56f15c1fe..6206b0f48c 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ includes submitting trivial PRs (like improving README build instructions). First install the javascript deps. - cd deno2 + cd src cd js; yarn install diff --git a/deno2/.gclient b/src/.gclient similarity index 100% rename from deno2/.gclient rename to src/.gclient diff --git a/deno2/.gitignore b/src/.gitignore similarity index 100% rename from deno2/.gitignore rename to src/.gitignore diff --git a/deno2/.gn b/src/.gn similarity index 100% rename from deno2/.gn rename to src/.gn diff --git a/deno2/BUILD.gn b/src/BUILD.gn similarity index 100% rename from deno2/BUILD.gn rename to src/BUILD.gn diff --git a/deno2/build b/src/build similarity index 100% rename from deno2/build rename to src/build diff --git a/deno2/build_overrides b/src/build_overrides similarity index 100% rename from deno2/build_overrides rename to src/build_overrides diff --git a/deno2/buildtools b/src/buildtools similarity index 100% rename from deno2/buildtools rename to src/buildtools diff --git a/deno2/deno.cc b/src/deno.cc similarity index 100% rename from deno2/deno.cc rename to src/deno.cc diff --git a/deno2/deno.gni b/src/deno.gni similarity index 100% rename from deno2/deno.gni rename to src/deno.gni diff --git a/deno2/deno_internal.h b/src/deno_internal.h similarity index 100% rename from deno2/deno_internal.h rename to src/deno_internal.h diff --git a/deno2/empty.rs b/src/empty.rs similarity index 100% rename from deno2/empty.rs rename to src/empty.rs diff --git a/deno2/file_util.cc b/src/file_util.cc similarity index 100% rename from deno2/file_util.cc rename to src/file_util.cc diff --git a/deno2/file_util.h b/src/file_util.h similarity index 100% rename from deno2/file_util.h rename to src/file_util.h diff --git a/deno2/file_util_test.cc b/src/file_util_test.cc similarity index 100% rename from deno2/file_util_test.cc rename to src/file_util_test.cc diff --git a/deno2/from_snapshot.cc b/src/from_snapshot.cc similarity index 100% rename from deno2/from_snapshot.cc rename to src/from_snapshot.cc diff --git a/deno2/include/deno.h b/src/include/deno.h similarity index 100% rename from deno2/include/deno.h rename to src/include/deno.h diff --git a/deno2/js/deno.d.ts b/src/js/deno.d.ts similarity index 100% rename from deno2/js/deno.d.ts rename to src/js/deno.d.ts diff --git a/deno2/js/main.ts b/src/js/main.ts similarity index 100% rename from deno2/js/main.ts rename to src/js/main.ts diff --git a/deno2/js/mock_runtime.js b/src/js/mock_runtime.js similarity index 100% rename from deno2/js/mock_runtime.js rename to src/js/mock_runtime.js diff --git a/deno2/js/msg.pb.d.ts b/src/js/msg.pb.d.ts similarity index 100% rename from deno2/js/msg.pb.d.ts rename to src/js/msg.pb.d.ts diff --git a/deno2/js/msg.pb.js b/src/js/msg.pb.js similarity index 100% rename from deno2/js/msg.pb.js rename to src/js/msg.pb.js diff --git a/deno2/js/package.json b/src/js/package.json similarity index 100% rename from deno2/js/package.json rename to src/js/package.json diff --git a/deno2/js/pbjs_hack.py b/src/js/pbjs_hack.py similarity index 100% rename from deno2/js/pbjs_hack.py rename to src/js/pbjs_hack.py diff --git a/deno2/js/run_node.py b/src/js/run_node.py similarity index 100% rename from deno2/js/run_node.py rename to src/js/run_node.py diff --git a/deno2/js/tsconfig.json b/src/js/tsconfig.json similarity index 100% rename from deno2/js/tsconfig.json rename to src/js/tsconfig.json diff --git a/deno2/js/yarn.lock b/src/js/yarn.lock similarity index 100% rename from deno2/js/yarn.lock rename to src/js/yarn.lock diff --git a/deno2/main.cc b/src/main.cc similarity index 100% rename from deno2/main.cc rename to src/main.cc diff --git a/deno2/main.rs b/src/main.rs similarity index 100% rename from deno2/main.rs rename to src/main.rs diff --git a/deno2/mock_runtime_test.cc b/src/mock_runtime_test.cc similarity index 100% rename from deno2/mock_runtime_test.cc rename to src/mock_runtime_test.cc diff --git a/deno2/msg.proto b/src/msg.proto similarity index 100% rename from deno2/msg.proto rename to src/msg.proto diff --git a/deno2/snapshot_creator.cc b/src/snapshot_creator.cc similarity index 100% rename from deno2/snapshot_creator.cc rename to src/snapshot_creator.cc diff --git a/deno2/testing b/src/testing similarity index 100% rename from deno2/testing rename to src/testing diff --git a/deno2/third_party/googletest b/src/third_party/googletest similarity index 100% rename from deno2/third_party/googletest rename to src/third_party/googletest diff --git a/deno2/third_party/jinja2 b/src/third_party/jinja2 similarity index 100% rename from deno2/third_party/jinja2 rename to src/third_party/jinja2 diff --git a/deno2/third_party/llvm-build b/src/third_party/llvm-build similarity index 100% rename from deno2/third_party/llvm-build rename to src/third_party/llvm-build diff --git a/deno2/third_party/markupsafe b/src/third_party/markupsafe similarity index 100% rename from deno2/third_party/markupsafe rename to src/third_party/markupsafe diff --git a/deno2/tools/clang b/src/tools/clang similarity index 100% rename from deno2/tools/clang rename to src/tools/clang diff --git a/deno2/tools/format.sh b/src/tools/format.sh similarity index 100% rename from deno2/tools/format.sh rename to src/tools/format.sh diff --git a/deno2/tools/lint.sh b/src/tools/lint.sh similarity index 100% rename from deno2/tools/lint.sh rename to src/tools/lint.sh