Support cargo check on mac/linux.

- Based on code from @qti3e and @piscisaureus in #724 and #1125
  respectively.
- TODO The DENO_BUILD_PATH env var must be supplied and must be an
  absolute path, this restriction should be removed in future work.

.gitignore

@@ -1,5 +1,6 @@
 # build
 /out/
+/target/
 *.pyc
 gclient_config.py_entries
 Cargo.lock

.travis.yml

@@ -14,6 +14,7 @@ env:
  - HOMEBREW_PATH=$HOME/homebrew/
  - DENO_BUILD_ARGS="use_custom_libcxx=false use_sysroot=false"
  - DENO_BUILD_PATH=$HOME/out/Default
+ - CARGO_TARGET_DIR=$DENO_BUILD_PATH
  - DENO_BUILD_MODE=release
  - PATH=$TRAVIS_BUILD_DIR/third_party/llvm-build/Release+Asserts/bin:$CARGO_HOME/bin:$PATH
  - CCACHE_CPP2=yes
@@ -88,8 +89,9 @@ before_script:
 script:
 - ./tools/lint.py
 - ./tools/test_format.py
-- bash -c "sleep 2100; pkill ninja" &
+- bash -c "sleep 2100; pkill ninja; pkill cargo" &
 - ./tools/build.py -j2
+- RUSTC_WRAPPER=sccache cargo check -j2 --release
 - ./tools/test.py $DENO_BUILD_PATH
 after_script:
 - ccache --show-stats

BUILD.gn

@@ -124,9 +124,7 @@ rust_executable("deno") {
  source_root = "src/main.rs"
  extern = main_extern
  deps = [
- ":libdeno",
- ":msg_rs",
- ":snapshot",
+ ":deno_deps",
  ]
 }
 
@@ -209,7 +207,6 @@ v8_executable("test_cc") {
 # Because snapshots are slow, it's important that snapshot_creator's
 # dependencies are minimal.
 static_library("libdeno") {
- complete_static_lib = true
  sources = [
  "libdeno/api.cc",
  "libdeno/binding.cc",
@@ -219,7 +216,26 @@ static_library("libdeno") {
  "libdeno/internal.h",
  ]
  public_deps = [
- "third_party/v8:v8_monolith",
+ "third_party/v8:v8",
+ "third_party/v8:v8_libbase",
+ "third_party/v8:v8_libplatform",
+ "third_party/v8:v8_libsampler",
+ "//build/win:default_exe_manifest",
+ ]
+ configs += [ ":deno_config" ]
+}
+
+static_library("deno_deps") {
+ complete_static_lib = true
+ public_deps = [
+ ":libdeno",
+ ":msg_rs",
+ ":snapshot",
+ "third_party/v8:v8",
+ "third_party/v8:v8_libbase",
+ "third_party/v8:v8_libplatform",
+ "third_party/v8:v8_libsampler",
+ "//build/win:default_exe_manifest",
  ]
  configs += [ ":deno_config" ]
 }

Cargo.toml

@@ -13,15 +13,21 @@ atty = "0.2.11"
 dirs = "1.0.4"
 flatbuffers = { path = "third_party/flatbuffers/rust/flatbuffers/" }
 futures = "0.1.25"
+getopts = "0.2.18"
 hyper = "0.12.12"
 # The current version of hyper-rustls, 0.14.0, depends on tokio-core, which is
 # deprecated.
 hyper-rustls = { git = "https://github.com/ctz/hyper-rustls.git" }
+lazy_static = "1.1.0"
 libc = "0.2.43"
 log = "0.4.5"
 rand = "0.4.3"
+remove_dir_all = "0.5.1"
 ring = "0.13.2"
 tempfile = "3"
 tokio = "0.1.11"
+tokio-executor = "0.1.5"
+tokio-fs = "0.1.3"
+tokio-io = "0.1.8"
+tokio-threadpool = "0.1.6"
 url = "1.7.1"
-getopts = "0.2.18"

build.rs

@@ -0,0 +1,37 @@
+// Copyright 2018 the Deno authors. All rights reserved. MIT license.
+
+// Run "cargo build -vv" if you want to see gn output.
+// TODO For the time being you must set an env var DENO_BUILD_PATH
+// which might be `pwd`/out/debug or `pwd`/out/release.
+// TODO Currently DENO_BUILD_PATH must be absolute.
+// TODO Combine DENO_BUILD_PATH and OUT_DIR.
+
+use std::env;
+use std::process::Command;
+
+fn main() {
+ let mode = env::var("PROFILE").unwrap();
+ let deno_build_path = env::var("DENO_BUILD_PATH").unwrap();
+
+ let status = Command::new("./tools/setup.py")
+ .env("DENO_BUILD_PATH", &deno_build_path)
+ .env("DENO_BUILD_MODE", &mode)
+ .status()
+ .expect("setup.py failed");
+ assert!(status.success());
+
+ // These configurations must be outputted after tools/setup.py is run.
+ println!("cargo:rustc-env=OUT_DIR={}", deno_build_path);
+ println!("cargo:rustc-link-search=native={}/obj", deno_build_path);
+ println!("cargo:rustc-link-lib=static=deno_deps");
+
+ let status = Command::new("python")
+ .env("DENO_BUILD_PATH", &deno_build_path)
+ .env("DENO_BUILD_MODE", &mode)
+ .arg("./tools/build.py")
+ .arg("deno_deps")
+ .arg("-v")
+ .status()
+ .expect("build.py failed");
+ assert!(status.success());
+}

tools/format.py

@@ -45,5 +45,5 @@ def qrun(cmd, env=None):
 print "rustfmt"
 qrun([
  "third_party/rustfmt/" + platform() +
- "/rustfmt", "--config-path", rustfmt_config
+ "/rustfmt", "--config-path", rustfmt_config, "build.rs"
 ] + find_exts(["src"], [".rs"]))