diff options
| author | Erick Tryzelaar <[email protected]> | 2013-12-18 08:51:10 -0800 |
|---|---|---|
| committer | Erick Tryzelaar <[email protected]> | 2013-12-18 08:51:10 -0800 |
| commit | a9ce2a36d54ac08608d689a5f0ec441f74e56d61 (patch) | |
| tree | 813ceb833817cfac21a1cc920446f8a7927acf76 | |
| parent | Update to rust 0.9x-pre (diff) | |
| download | rust-openssl-a9ce2a36d54ac08608d689a5f0ec441f74e56d61.tar.xz rust-openssl-a9ce2a36d54ac08608d689a5f0ec441f74e56d61.zip | |
Switch over to rustpkg
| -rw-r--r-- | .gitignore | 10 | ||||
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | Makefile | 16 | ||||
| -rw-r--r-- | src/crypto/hash.rs (renamed from hash.rs) | 0 | ||||
| -rw-r--r-- | src/crypto/hex.rs (renamed from hex.rs) | 0 | ||||
| -rw-r--r-- | src/crypto/hmac.rs (renamed from hmac.rs) | 0 | ||||
| -rw-r--r-- | src/crypto/lib.rs (renamed from crypto.rs) | 0 | ||||
| -rw-r--r-- | src/crypto/pkcs5.rs (renamed from pkcs5.rs) | 0 | ||||
| -rw-r--r-- | src/crypto/pkey.rs (renamed from pkey.rs) | 0 | ||||
| -rw-r--r-- | src/crypto/rand.rs (renamed from rand.rs) | 0 | ||||
| -rw-r--r-- | src/crypto/symm.rs (renamed from symm.rs) | 0 |
11 files changed, 18 insertions, 11 deletions
@@ -1,5 +1,9 @@ *.sw[po] -libcrypto*.dylib -libcrypto*.so +*.dylib +*.so *.dSYM/ -crypto +/.rust +/bin/ +/build/ +/lib/ +/src/crypto/lib diff --git a/.travis.yml b/.travis.yml index ed4eeddf..1ba08680 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,5 +4,4 @@ before_install: install: - sudo apt-get install rust-nightly script: - - make all - - ./crypto + - make all test @@ -1,9 +1,13 @@ +RUSTPKG ?= rustpkg +RUSTC ?= rustc +RUST_FLAGS ?= -Z debug-info -O -crypto: $(wildcard *.rs) - rustc crypto.rs - rustc --test crypto.rs +all: + $(RUSTPKG) $(RUST_FLAGS) install crypto + +test: + $(RUSTC) $(RUST_FLAGS) --test src/crypto/lib.rs + ./src/crypto/lib clean: - rm -f crypto libcrypto-*.so - rm -f libcrypto-*.dylib - rm -rf *.dSYM + rm -rf bin/ lib/ build/ src/crypto/lib diff --git a/hash.rs b/src/crypto/hash.rs index 339aafeb..339aafeb 100644 --- a/hash.rs +++ b/src/crypto/hash.rs diff --git a/hex.rs b/src/crypto/hex.rs index f55dc1a9..f55dc1a9 100644 --- a/hex.rs +++ b/src/crypto/hex.rs diff --git a/hmac.rs b/src/crypto/hmac.rs index 5bc8b359..5bc8b359 100644 --- a/hmac.rs +++ b/src/crypto/hmac.rs diff --git a/crypto.rs b/src/crypto/lib.rs index 7ed4bfd9..7ed4bfd9 100644 --- a/crypto.rs +++ b/src/crypto/lib.rs diff --git a/pkcs5.rs b/src/crypto/pkcs5.rs index 9dfc026c..9dfc026c 100644 --- a/pkcs5.rs +++ b/src/crypto/pkcs5.rs diff --git a/pkey.rs b/src/crypto/pkey.rs index 7b5245b2..7b5245b2 100644 --- a/pkey.rs +++ b/src/crypto/pkey.rs diff --git a/rand.rs b/src/crypto/rand.rs index 6510b9f4..6510b9f4 100644 --- a/rand.rs +++ b/src/crypto/rand.rs diff --git a/symm.rs b/src/crypto/symm.rs index 3d31bde0..3d31bde0 100644 --- a/symm.rs +++ b/src/crypto/symm.rs |