move v8 to third_party/v8 (denoland#322)

ondras · Jul 3, 2018 · 6f7ca76 · 6f7ca76
1 parent 6d288b6
commit 6f7ca76
Show file tree

Hide file tree

Showing 23 changed files with 45 additions and 36 deletions.
diff --git a/.gclient b/.gclient
@@ -19,7 +19,7 @@ solutions = [{
  }
 }, {
  'url': 'https://github.com/ry/protobuf_chromium.git',
- 'name': 'third_party/protobuf',
+ 'name': 'protobuf',
 }, {
  'url':
  'https://chromium.googlesource.com/chromium/src/tools/protoc_wrapper@9af82fef8cb9ca3ccc13e2ed958f58f2c21f449b',
@@ -29,15 +29,15 @@ solutions = [{
  'url':
  'https://chromium.googlesource.com/chromium/src/third_party/zlib@39b4a6260702da4c089eca57136abf40a39667e9',
  'name':
- 'third_party/zlib'
+ 'zlib'
 }, {
  'url':
  'https://github.com/cpplint/cpplint.git@a33992f68f36fcaa6d0f531a25012a4c474d3542',
  'name':
- 'third_party/cpplint'
+ 'cpplint'
 }, {
  'url':
  'https://github.com/rust-lang/libc.git@8a85d662b90c14d458bc4ae9521a05564e20d7ae',
  'name':
- 'third_party/rust_crates/libc'
+ 'rust_crates/libc'
 }]
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,16 @@
+# build
 /out/
+
+# npm deps
 node_modules
-/v8/
-/tools/protoc_wrapper/
+
+# git deps
+/third_party/v8/
+/third_party/tools/protoc_wrapper/
 /third_party/cpplint/
 /third_party/protobuf/
 /third_party/zlib/
 /third_party/rust_crates/libc/
-/.gclient_entries
+
+# gclient files
+/third_party/.gclient_entries
diff --git a/.travis.yml b/.travis.yml
@@ -29,7 +29,7 @@ install:
  - export PATH=$HOME/.cargo/bin:$PATH
  - rustc --version
  - (cd js; yarn)
- - gclient sync -j2 --no-history
+ - (cd third_party; 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
  - export CCACHE_CPP2=yes

diff --git a/BUILD.gn b/BUILD.gn
@@ -1,11 +1,11 @@
 import("//third_party/protobuf/proto_library.gni")
-import("//v8/gni/v8.gni")
-import("//v8/snapshot_toolchain.gni")
+import("//third_party/v8/gni/v8.gni")
+import("//third_party/v8/snapshot_toolchain.gni")
 import("deno.gni")
 
 config("deno_config") {
- include_dirs = [ "v8" ] # This allows us to v8/src/base/ libraries.
- configs = [ "v8:external_config" ]
+ include_dirs = [ "third_party/v8" ] # This allows us to v8/src/base/ libraries.
+ configs = [ "third_party/v8:external_config" ]
 }
 
 rust_executable("deno") {
@@ -73,7 +73,7 @@ v8_source_set("deno_nosnapshot") {
  "src/include/deno.h",
  ]
  deps = [
- "v8:v8_monolith",
+ "third_party/v8:v8_monolith",
  ]
  configs = [ ":deno_config" ]
 }

diff --git a/README.md b/README.md
@@ -74,8 +74,8 @@ You need [rust](https://www.rust-lang.org/en-US/install.html) installed.
 You need [ccache](https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide/Build_Instructions/ccache) installed.
 
 Fetch packages and v8:
-``` bash
-gclient sync --no-history
+```bash
+(cd third_party; gclient sync --no-history)
 ```
 
 Install the javascript deps.

diff --git a/build b/build
@@ -1 +1 @@
-v8/build
+third_party/v8/build
diff --git a/build_overrides b/build_overrides
@@ -1 +1 @@
-v8/build_overrides
+third_party/v8/build_overrides
diff --git a/buildtools b/buildtools
@@ -1 +1 @@
-v8/buildtools
+third_party/v8/buildtools
diff --git a/deno.gni b/deno.gni
@@ -26,7 +26,7 @@ template("create_snapshot") {
  ])
  visibility = [ ":*" ] # Only targets in this file can depend on this.
  deps += [ ":snapshot_creator" ]
- script = "v8/tools/run.py"
+ script = "third_party/v8/tools/run.py"
  data = []
  exe = rebase_path(get_label_info(":snapshot_creator", "root_out_dir") +
  "/snapshot_creator")
@@ -66,7 +66,7 @@ template("rust_crate") {
  ]
  outputs = []
  depfile = "$target_gen_dir/$target_name.d"
- script = "v8/tools/run.py"
+ script = "third_party/v8/tools/run.py"
 
  args = [
  "rustc",

diff --git a/src/deno.cc b/src/deno.cc
@@ -24,9 +24,9 @@ IN THE SOFTWARE.
 #include <string.h>
 #include <string>
 
-#include "v8/include/libplatform/libplatform.h"
-#include "v8/include/v8.h"
-#include "v8/src/base/logging.h"
+#include "third_party/v8/include/libplatform/libplatform.h"
+#include "third_party/v8/include/v8.h"
+#include "third_party/v8/src/base/logging.h"
 
 #include "./deno_internal.h"
 #include "include/deno.h"

diff --git a/src/deno_internal.h b/src/deno_internal.h
@@ -5,7 +5,7 @@
 
 #include <string>
 #include "include/deno.h"
-#include "v8/include/v8.h"
+#include "third_party/v8/include/v8.h"
 
 extern "C" {
 // deno_s = Wrapped Isolate.

diff --git a/src/file_util.cc b/src/file_util.cc
@@ -44,7 +44,7 @@ class StartupDataCppWriter {
  private:
  void WritePrefix() {
  file_ << "// Autogenerated snapshot file. Do not edit.\n\n";
- file_ << "#include \"v8/include/v8.h\"\n\n";
+ file_ << "#include \"third_party/v8/include/v8.h\"\n\n";
  file_ << "namespace deno { \n\n";
  }
 

diff --git a/src/from_snapshot.cc b/src/from_snapshot.cc
@@ -5,8 +5,8 @@
 #include <string.h>
 #include <string>
 
-#include "v8/include/v8.h"
-#include "v8/src/base/logging.h"
+#include "third_party/v8/include/v8.h"
+#include "third_party/v8/src/base/logging.h"
 
 #include "./deno_internal.h"
 #include "include/deno.h"

diff --git a/src/mock_main.cc b/src/mock_main.cc
@@ -12,7 +12,7 @@
 
 #include "./msg.pb.h"
 #include "include/deno.h"
-#include "v8/src/base/logging.h"
+#include "third_party/v8/src/base/logging.h"
 
 static char** global_argv;
 static int global_argc;

diff --git a/src/snapshot_creator.cc b/src/snapshot_creator.cc
@@ -4,8 +4,8 @@
 #include "deno_internal.h"
 #include "file_util.h"
 #include "include/deno.h"
-#include "v8/include/v8.h"
-#include "v8/src/base/logging.h"
+#include "third_party/v8/include/v8.h"
+#include "third_party/v8/src/base/logging.h"
 
 namespace deno {
 

diff --git a/testing b/testing
@@ -1 +1 @@
-v8/testing
+third_party/v8/testing
diff --git a/third_party/.gclient b/third_party/.gclient
@@ -0,0 +1 @@
+../.gclient
diff --git a/third_party/googletest b/third_party/googletest
@@ -1 +1 @@
-../v8/third_party/googletest
+v8/third_party/googletest
diff --git a/third_party/jinja2 b/third_party/jinja2
@@ -1 +1 @@
-../v8/third_party/jinja2
+v8/third_party/jinja2
diff --git a/third_party/llvm-build b/third_party/llvm-build
@@ -1 +1 @@
-../v8/third_party/llvm-build
+v8/third_party/llvm-build
diff --git a/third_party/markupsafe b/third_party/markupsafe
@@ -1 +1 @@
-../v8/third_party/markupsafe
+v8/third_party/markupsafe
diff --git a/tools/clang b/tools/clang
@@ -1 +1 @@
-../v8/tools/clang
+../third_party/v8/tools/clang
diff --git a/tools/protoc_wrapper b/tools/protoc_wrapper
@@ -0,0 +1 @@
+../third_party/tools/protoc_wrapper