diff options
| author | Chelsea Holland Komlo <me@chelseakomlo.com> | 2017-10-12 17:29:51 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-10-27 10:02:08 -0400 |
| commit | 0c4d535972bcf14fec0b65c82359db28b0cc0091 (patch) | |
| tree | f7ab90fcf661b29bc1e80cfa16c21832d8eae3db /src/rust/tor_rust | |
| parent | be583a34a3815c2c10e86094ab0610e4b7f9c869 (diff) | |
| download | tor-0c4d535972bcf14fec0b65c82359db28b0cc0091.tar.gz tor-0c4d535972bcf14fec0b65c82359db28b0cc0091.zip | |
refactor build infrastructure for single rust binary
Diffstat (limited to 'src/rust/tor_rust')
| -rw-r--r-- | src/rust/tor_rust/Cargo.toml | 16 | ||||
| -rw-r--r-- | src/rust/tor_rust/include.am | 12 | ||||
| -rw-r--r-- | src/rust/tor_rust/lib.rs | 5 |
3 files changed, 33 insertions, 0 deletions
diff --git a/src/rust/tor_rust/Cargo.toml b/src/rust/tor_rust/Cargo.toml new file mode 100644 index 0000000000..86fad3ee76 --- /dev/null +++ b/src/rust/tor_rust/Cargo.toml @@ -0,0 +1,16 @@ +[package] +authors = ["The Tor Project"] +name = "tor_rust" +version = "0.1.0" + +[lib] +name = "tor_rust" +path = "lib.rs" +crate_type = ["rlib", "staticlib"] + +[dependencies.tor_util] +path = "../tor_util" + +[dependencies.protover] +path = "../protover" + diff --git a/src/rust/tor_rust/include.am b/src/rust/tor_rust/include.am new file mode 100644 index 0000000000..7d30592b07 --- /dev/null +++ b/src/rust/tor_rust/include.am @@ -0,0 +1,12 @@ +EXTRA_DIST +=\ + src/rust/tor_rust/Cargo.toml \ + src/rust/tor_rust/lib.rs \ + src/rust/tor_rust/tor_rust.rs + +src/rust/target/release/@TOR_RUST_STATIC_NAME@: FORCE + ( cd "$(abs_top_srcdir)/src/rust/tor_rust" ; \ + CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ + CARGO_HOME="$(abs_top_builddir)/src/rust" \ + $(CARGO) build --release --quiet $(CARGO_ONLINE) ) + +FORCE: diff --git a/src/rust/tor_rust/lib.rs b/src/rust/tor_rust/lib.rs new file mode 100644 index 0000000000..c1585c0480 --- /dev/null +++ b/src/rust/tor_rust/lib.rs @@ -0,0 +1,5 @@ +extern crate tor_util; +extern crate protover; + +pub use tor_util::*; +pub use protover::*; |