diff options
| -rw-r--r-- | BUILD.gn | 2 | ||||
| -rw-r--r-- | build_extra/flatbuffers/rust/rust_flatbuffer.gni | 13 | ||||
| -rw-r--r-- | build_extra/rust/run.py | 10 | ||||
| -rw-r--r-- | build_extra/rust/rust.gni | 2 | ||||
| -rw-r--r-- | gclient_config.py | 2 | ||||
| -rw-r--r-- | src/main.rs | 2 | ||||
| -rw-r--r-- | src/msg.rs | 4 | ||||
| m--------- | third_party | 0 |
8 files changed, 19 insertions, 16 deletions
@@ -64,7 +64,6 @@ main_extern = [ "$rust_build:tokio_threadpool", "$rust_build:url", "//build_extra/flatbuffers/rust:flatbuffers", - ":msg_rs", ] ts_sources = [ @@ -126,6 +125,7 @@ rust_executable("deno") { extern = main_extern deps = [ ":libdeno", + ":msg_rs", ":snapshot", ] } diff --git a/build_extra/flatbuffers/rust/rust_flatbuffer.gni b/build_extra/flatbuffers/rust/rust_flatbuffer.gni index 4255b21ec..3d01562be 100644 --- a/build_extra/flatbuffers/rust/rust_flatbuffer.gni +++ b/build_extra/flatbuffers/rust/rust_flatbuffer.gni @@ -5,9 +5,7 @@ import("//build_extra/rust/rust.gni") import("//build_extra/flatbuffers/flatbuffer.gni") template("rust_flatbuffer") { - action_name = "${target_name}_gen" - source_set_name = target_name - compiled_action_foreach(action_name) { + compiled_action_foreach(target_name) { tool = "$flatbuffers_build_location:flatc" sources = invoker.sources @@ -32,13 +30,4 @@ template("rust_flatbuffer") { deps += invoker.deps } } - - rust_crate(source_set_name) { - sources = get_target_outputs(":$action_name") - source_root = sources[0] - deps = [ - ":$action_name", - ] - extern = [ "//build_extra/flatbuffers/rust:flatbuffers" ] - } } diff --git a/build_extra/rust/run.py b/build_extra/rust/run.py new file mode 100644 index 000000000..276e799cc --- /dev/null +++ b/build_extra/rust/run.py @@ -0,0 +1,10 @@ +#!/usr/bin/env python +# This file just executes its arguments, except that also adds OUT_DIR to the +# environ. This is for compatibility with cargo. +import subprocess +import sys +import os + +os.environ["OUT_DIR"] = os.path.abspath(".") +assert os.path.isdir(os.environ["OUT_DIR"]) +sys.exit(subprocess.call(sys.argv[1:], env=os.environ)) diff --git a/build_extra/rust/rust.gni b/build_extra/rust/rust.gni index 889e25467..c7ad376d0 100644 --- a/build_extra/rust/rust.gni +++ b/build_extra/rust/rust.gni @@ -151,7 +151,7 @@ template("rust_crate") { } action(action_name) { - script = "//third_party/v8/tools/run.py" + script = "//build_extra/rust/run.py" sources = [ source_root, ] diff --git a/gclient_config.py b/gclient_config.py index 93d744a3f..2e6f7c6e0 100644 --- a/gclient_config.py +++ b/gclient_config.py @@ -37,7 +37,7 @@ solutions = [{ 'cpplint' }, { 'url': - 'https://github.com/google/flatbuffers.git@d840856093fa7b935b0d6378c436bd633d006c8c', + 'https://github.com/google/flatbuffers.git@160e8f2fdc9d5989e652709fae3fac0bd9aaed14', 'name': 'flatbuffers' }] diff --git a/src/main.rs b/src/main.rs index b1ee08088..3865e9253 100644 --- a/src/main.rs +++ b/src/main.rs @@ -5,7 +5,6 @@ extern crate getopts; extern crate hyper; extern crate hyper_rustls; extern crate libc; -extern crate msg_rs as msg; extern crate rand; extern crate remove_dir_all; extern crate ring; @@ -31,6 +30,7 @@ mod fs; mod http_util; mod isolate; mod libdeno; +mod msg; pub mod ops; mod permissions; mod resources; diff --git a/src/msg.rs b/src/msg.rs new file mode 100644 index 000000000..8b66704fc --- /dev/null +++ b/src/msg.rs @@ -0,0 +1,4 @@ +#![allow(unused_imports)] +#![allow(dead_code)] +use flatbuffers; +include!(concat!(env!("OUT_DIR"), "/gen/msg_generated.rs")); diff --git a/third_party b/third_party -Subproject 56c4acce2e8ffe979b2e7d52d2b3e6f613ed492 +Subproject c103d4620cf6df002b1a733963a9cb82a42df83 |