From 3ec98eb9f5a1214200dcbf227c752c36c777e227 Mon Sep 17 00:00:00 2001 From: ozkriff Date: Wed, 7 May 2014 15:58:48 +0400 Subject: [PATCH 1/3] .travis.yml: Download rustc from rust-lang.org --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 73f6c03..1841682 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,15 +17,17 @@ env: global: - secure: N41M4QTWbez7FRMh2HQqB3Z051FcruoRGLTdMdQJNMaZRqJiAfUBTO5NGXS5XGjIofknE4r/+WLv7KED2rTf6nvLFOHmGY2pL+agABcyD0DU0ltRLckjONWTxFN+SMTB0l38v3XIXxXX5y977Hl6wk3++kYZgCNVG3OTkJwWzQg= before_install: - - yes | sudo add-apt-repository ppa:hansjorg/rust - sudo apt-get update install: - - sudo apt-get install rust-nightly + - wget http://static.rust-lang.org/dist/rust-nightly-x86_64-unknown-linux-gnu.tar.gz + - tar xzf rust-nightly-x86_64-unknown-linux-gnu.tar.gz + - export PATH=$PATH:$(pwd)/rust-nightly-x86_64-unknown-linux-gnu/bin + - rustc -v script: - make # - make check # bench is too slow - make test - - sudo make install + - sudo env PATH=$PATH make install - sudo make uninstall - make clean - make doc From 60764bb9fdfa656996995b2d983cc60c1a2b2b43 Mon Sep 17 00:00:00 2001 From: ozkriff Date: Wed, 7 May 2014 22:15:57 +0400 Subject: [PATCH 2/3] Makefile: Fixed 'lib' target --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 49361cc..61997d4 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ LIB_INSTALL_DIR = $(INSTALL_PREFIX)/lib all: lib doc -lib: +lib: $(LIB_FILE) mkdir -p $(LIB_DIR) $(RUSTC) --out-dir=$(LIB_DIR) -O $(LIB_FILE) From 20e472fdf9ba9e15a4619f467616b06f898e0026 Mon Sep 17 00:00:00 2001 From: ozkriff Date: Wed, 7 May 2014 22:16:22 +0400 Subject: [PATCH 3/3] Makefile: Removed (un)install targets --- .travis.yml | 2 -- Makefile | 13 ------------- 2 files changed, 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1841682..1e9623c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,8 +27,6 @@ script: - make # - make check # bench is too slow - make test - - sudo env PATH=$PATH make install - - sudo make uninstall - make clean - make doc after_script: diff --git a/Makefile b/Makefile index 61997d4..edf0ac8 100644 --- a/Makefile +++ b/Makefile @@ -54,17 +54,6 @@ doc: mkdir -p $(DOC_DIR) $(RUSTDOC) -o $(DOC_DIR) $(LIB_FILE) -install: lib - @ $(foreach crate, $(CRATE_FILES), \ - cp $(LIB_DIR)/$(crate) $(LIB_INSTALL_DIR)/$(crate) && \ - echo "Installed $(crate) to $(LIB_INSTALL_DIR)" ; \ - ) - -uninstall: - @-rm -f $(LIB_INSTALL_DIR)/lib$(CRATE_NAME)-*.rlib ||: - @-rm -f $(LIB_INSTALL_DIR)/lib$(CRATE_NAME)-*.so ||: - @-rm -f $(LIB_INSTALL_DIR)/lib$(CRATE_NAME)-*.dylib ||: - clean: rm -rf $(LIB_DIR) rm -rf $(TEST_DIR) @@ -78,6 +67,4 @@ clean: bench \ check \ doc \ - install \ - uninstall \ clean