diff options
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | Cargo.toml | 29 | ||||
| -rw-r--r-- | bindgen/Cargo.toml | 26 | ||||
| -rw-r--r-- | bindgen/src/main.rs (renamed from src/main.rs) | 0 | ||||
| -rw-r--r-- | bindgen/src/options.rs (renamed from src/options.rs) | 0 | ||||
| -rw-r--r-- | libbindgen/Cargo.toml | 4 | ||||
| -rw-r--r-- | libbindgen/README.md | 3 | ||||
| -rw-r--r-- | libbindgen/tests/expectations/Cargo.toml | 1 | ||||
| -rw-r--r-- | libbindgen/tests/tests.rs | 2 |
9 files changed, 41 insertions, 29 deletions
diff --git a/.travis.yml b/.travis.yml index 17beccc6..5882493b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,9 +31,10 @@ script: - git add -A - git diff @ - git diff-index --quiet HEAD - - cargo test -p tests_expectations - cargo build --features "$BINDGEN_FEATURES _docs" - - cd .. + - cd tests/expectations + - cargo test + - cd ../../../bindgen - cargo test --features "$BINDGEN_FEATURES" - cargo test --release --features "$BINDGEN_FEATURES" @@ -1,25 +1,6 @@ -[package] -authors = [ - "Jyun-Yan You <jyyou.tw@gmail.com>", - "Emilio Cobos Álvarez <ecoal95@gmail.com>", - "The Servo project developers", +[workspace] +members = [ + "bindgen", + "libbindgen", + "libbindgen/tests/expectations", ] -description = "A binding generator for Rust" -homepage = "https://github.com/servo/rust-bindgen" -keywords = ["bindings", "ffi", "code-generation"] -license = "BSD-3-Clause" -name = "bindgen" -readme = "README.md" -repository = "https://github.com/servo/rust-bindgen" -version = "0.17.0" - -[dependencies] -clang-sys = "0.11.1" -clap = "2" -libbindgen = { path = "libbindgen" } -log = "0.3" -env_logger = "0.3" -rustc-serialize = "0.3.19" - -[features] -llvm_stable = ["libbindgen/llvm_stable"] diff --git a/bindgen/Cargo.toml b/bindgen/Cargo.toml new file mode 100644 index 00000000..1ac99d03 --- /dev/null +++ b/bindgen/Cargo.toml @@ -0,0 +1,26 @@ +[package] +authors = [ + "Jyun-Yan You <jyyou.tw@gmail.com>", + "Emilio Cobos Álvarez <ecoal95@gmail.com>", + "The Servo project developers", +] +description = "A binding generator for Rust" +homepage = "https://github.com/servo/rust-bindgen" +keywords = ["bindings", "ffi", "code-generation"] +license = "BSD-3-Clause" +name = "bindgen" +readme = "README.md" +repository = "https://github.com/servo/rust-bindgen" +version = "0.17.0" +workspace = ".." + +[dependencies] +clang-sys = "0.11.1" +clap = "2" +libbindgen = { path = "../libbindgen" } +log = "0.3" +env_logger = "0.3" +rustc-serialize = "0.3.19" + +[features] +llvm_stable = ["libbindgen/llvm_stable"] diff --git a/src/main.rs b/bindgen/src/main.rs index 8cbff63b..8cbff63b 100644 --- a/src/main.rs +++ b/bindgen/src/main.rs diff --git a/src/options.rs b/bindgen/src/options.rs index a783696e..a783696e 100644 --- a/src/options.rs +++ b/bindgen/src/options.rs diff --git a/libbindgen/Cargo.toml b/libbindgen/Cargo.toml index a094824c..4b3a4f49 100644 --- a/libbindgen/Cargo.toml +++ b/libbindgen/Cargo.toml @@ -12,13 +12,13 @@ license = "BSD-3-Clause" name = "libbindgen" readme = "README.md" repository = "https://github.com/servo/rust-bindgen" -version = "0.17.0" +version = "0.1.0" +workspace = ".." [dev-dependencies] diff = "0.1" clap = "2" shlex = "0.1" -tests_expectations = { path = "tests/expectations" } [build-dependencies] quasi_codegen = "0.21" diff --git a/libbindgen/README.md b/libbindgen/README.md new file mode 100644 index 00000000..e0bbddf5 --- /dev/null +++ b/libbindgen/README.md @@ -0,0 +1,3 @@ +# `libbindgen` + +Generate Rust FFI bindings from C/C++ header files. diff --git a/libbindgen/tests/expectations/Cargo.toml b/libbindgen/tests/expectations/Cargo.toml index 53f1b14f..0980c564 100644 --- a/libbindgen/tests/expectations/Cargo.toml +++ b/libbindgen/tests/expectations/Cargo.toml @@ -7,5 +7,6 @@ authors = [ "Emilio Cobos Álvarez <ecoal95@gmail.com>", "The Servo project developers", ] +workspace = "../../.." [dependencies] diff --git a/libbindgen/tests/tests.rs b/libbindgen/tests/tests.rs index e4a62523..12816c1b 100644 --- a/libbindgen/tests/tests.rs +++ b/libbindgen/tests/tests.rs @@ -7,7 +7,7 @@ use std::fs; use std::io::{BufRead, BufReader, Error, ErrorKind, Read, Write}; use std::path::PathBuf; -#[path="../../src/options.rs"] +#[path="../../bindgen/src/options.rs"] mod options; use options::builder_from_flags; |