diff options
author | Jyun-Yan You <jyyou@cs.nctu.edu.tw> | 2014-09-04 16:37:57 +0800 |
---|---|---|
committer | Jyun-Yan You <jyyou@cs.nctu.edu.tw> | 2014-09-04 16:37:57 +0800 |
commit | 3f889622e8957c4e0b759a1ffb31f4a8f799aca0 (patch) | |
tree | 5d4f5e41dbb248429c3ffe1b6b7d33085ce56618 | |
parent | e4bbde2e90839b4b3f8949178d491981a775d9e5 (diff) | |
parent | b36bdbbc6ab806c46822c9486a859fa8dead91d2 (diff) |
Merge branch 'master' of https://github.com/alexchandel/rust-bindgen
-rw-r--r-- | .gitignore | 5 | ||||
-rw-r--r-- | .travis.yml | 6 | ||||
-rw-r--r-- | Cargo.toml | 11 | ||||
-rw-r--r-- | src/bin/bindgen.rs (renamed from bindgen.rs) | 0 | ||||
-rw-r--r-- | src/clang.rs (renamed from clang.rs) | 0 | ||||
-rw-r--r-- | src/clangll.rs (renamed from clangll.rs) | 0 | ||||
-rw-r--r-- | src/gen.rs (renamed from gen.rs) | 0 | ||||
-rw-r--r-- | src/lib.rs (renamed from lib.rs) | 0 | ||||
-rw-r--r-- | src/macro.rs (renamed from macro.rs) | 0 | ||||
-rw-r--r-- | src/parser.rs (renamed from parser.rs) | 0 | ||||
-rw-r--r-- | src/types.rs (renamed from types.rs) | 0 |
11 files changed, 18 insertions, 4 deletions
@@ -1,2 +1,5 @@ bindgen -libbindgen*
\ No newline at end of file +libbindgen* + +# Cargo +target/ diff --git a/.travis.yml b/.travis.yml index 42df1e15..dff4eb1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,9 @@ before_install: - yes | sudo add-apt-repository "deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.4 main" - yes | sudo add-apt-repository "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu precise main" - yes | sudo add-apt-repository ppa:hansjorg/rust + - yes | sudo add-apt-repository ppa:cmrx64/cargo - sudo apt-get update install: - - sudo apt-get install --force-yes libclang-3.4-dev rust-nightly + - sudo apt-get install --force-yes libclang-3.4-dev rust-nightly cargo script: - - rustc lib.rs -L /usr/lib/llvm-3.4/lib - - rustc bindgen.rs -L /usr/lib/llvm-3.4/lib -L . + - cargo build diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 00000000..e2d5cd03 --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,11 @@ +[package] +name = "rust-bindgen" +version = "0.0.0" +authors = [ "crabtw" ] + +[[lib]] +name = "bindgen" +path = "src/lib.rs" + +[[bin]] +name = "bindgen" diff --git a/bindgen.rs b/src/bin/bindgen.rs index a14f331c..a14f331c 100644 --- a/bindgen.rs +++ b/src/bin/bindgen.rs diff --git a/clangll.rs b/src/clangll.rs index 27261f83..27261f83 100644 --- a/clangll.rs +++ b/src/clangll.rs diff --git a/parser.rs b/src/parser.rs index 8a16c983..8a16c983 100644 --- a/parser.rs +++ b/src/parser.rs |