1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-25 00:29:09 -05:00

move v8 to third_party/v8 (#322)

This commit is contained in:
Yoshiya Hinosawa 2018-07-03 17:15:32 +09:00 committed by Ryan Dahl
parent 6d288b63cd
commit 6f7ca760b8
23 changed files with 45 additions and 36 deletions

View file

@ -19,7 +19,7 @@ solutions = [{
} }
}, { }, {
'url': 'https://github.com/ry/protobuf_chromium.git', 'url': 'https://github.com/ry/protobuf_chromium.git',
'name': 'third_party/protobuf', 'name': 'protobuf',
}, { }, {
'url': 'url':
'https://chromium.googlesource.com/chromium/src/tools/protoc_wrapper@9af82fef8cb9ca3ccc13e2ed958f58f2c21f449b', 'https://chromium.googlesource.com/chromium/src/tools/protoc_wrapper@9af82fef8cb9ca3ccc13e2ed958f58f2c21f449b',
@ -29,15 +29,15 @@ solutions = [{
'url': 'url':
'https://chromium.googlesource.com/chromium/src/third_party/zlib@39b4a6260702da4c089eca57136abf40a39667e9', 'https://chromium.googlesource.com/chromium/src/third_party/zlib@39b4a6260702da4c089eca57136abf40a39667e9',
'name': 'name':
'third_party/zlib' 'zlib'
}, { }, {
'url': 'url':
'https://github.com/cpplint/cpplint.git@a33992f68f36fcaa6d0f531a25012a4c474d3542', 'https://github.com/cpplint/cpplint.git@a33992f68f36fcaa6d0f531a25012a4c474d3542',
'name': 'name':
'third_party/cpplint' 'cpplint'
}, { }, {
'url': 'url':
'https://github.com/rust-lang/libc.git@8a85d662b90c14d458bc4ae9521a05564e20d7ae', 'https://github.com/rust-lang/libc.git@8a85d662b90c14d458bc4ae9521a05564e20d7ae',
'name': 'name':
'third_party/rust_crates/libc' 'rust_crates/libc'
}] }]

13
.gitignore vendored
View file

@ -1,9 +1,16 @@
# build
/out/ /out/
# npm deps
node_modules node_modules
/v8/
/tools/protoc_wrapper/ # git deps
/third_party/v8/
/third_party/tools/protoc_wrapper/
/third_party/cpplint/ /third_party/cpplint/
/third_party/protobuf/ /third_party/protobuf/
/third_party/zlib/ /third_party/zlib/
/third_party/rust_crates/libc/ /third_party/rust_crates/libc/
/.gclient_entries
# gclient files
/third_party/.gclient_entries

View file

@ -29,7 +29,7 @@ install:
- export PATH=$HOME/.cargo/bin:$PATH - export PATH=$HOME/.cargo/bin:$PATH
- rustc --version - rustc --version
- (cd js; yarn) - (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. # ccache needs the custom LLVM to be in PATH and other variables.
- export PATH=`pwd`/third_party/llvm-build/Release+Asserts/bin:$PATH - export PATH=`pwd`/third_party/llvm-build/Release+Asserts/bin:$PATH
- export CCACHE_CPP2=yes - export CCACHE_CPP2=yes

View file

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

View file

@ -75,7 +75,7 @@ You need [ccache](https://developer.mozilla.org/en-US/docs/Mozilla/Developer_gui
Fetch packages and v8: Fetch packages and v8:
```bash ```bash
gclient sync --no-history (cd third_party; gclient sync --no-history)
``` ```
Install the javascript deps. Install the javascript deps.

2
build
View file

@ -1 +1 @@
v8/build third_party/v8/build

View file

@ -1 +1 @@
v8/build_overrides third_party/v8/build_overrides

View file

@ -1 +1 @@
v8/buildtools third_party/v8/buildtools

View file

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

View file

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

View file

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

View file

@ -44,7 +44,7 @@ class StartupDataCppWriter {
private: private:
void WritePrefix() { void WritePrefix() {
file_ << "// Autogenerated snapshot file. Do not edit.\n\n"; 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"; file_ << "namespace deno { \n\n";
} }

View file

@ -5,8 +5,8 @@
#include <string.h> #include <string.h>
#include <string> #include <string>
#include "v8/include/v8.h" #include "third_party/v8/include/v8.h"
#include "v8/src/base/logging.h" #include "third_party/v8/src/base/logging.h"
#include "./deno_internal.h" #include "./deno_internal.h"
#include "include/deno.h" #include "include/deno.h"

View file

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

View file

@ -4,8 +4,8 @@
#include "deno_internal.h" #include "deno_internal.h"
#include "file_util.h" #include "file_util.h"
#include "include/deno.h" #include "include/deno.h"
#include "v8/include/v8.h" #include "third_party/v8/include/v8.h"
#include "v8/src/base/logging.h" #include "third_party/v8/src/base/logging.h"
namespace deno { namespace deno {

View file

@ -1 +1 @@
v8/testing third_party/v8/testing

1
third_party/.gclient vendored Symbolic link
View file

@ -0,0 +1 @@
../.gclient

View file

@ -1 +1 @@
../v8/third_party/googletest v8/third_party/googletest

2
third_party/jinja2 vendored
View file

@ -1 +1 @@
../v8/third_party/jinja2 v8/third_party/jinja2

View file

@ -1 +1 @@
../v8/third_party/llvm-build v8/third_party/llvm-build

View file

@ -1 +1 @@
../v8/third_party/markupsafe v8/third_party/markupsafe

View file

@ -1 +1 @@
../v8/tools/clang ../third_party/v8/tools/clang

1
tools/protoc_wrapper Symbolic link
View file

@ -0,0 +1 @@
../third_party/tools/protoc_wrapper