Skip to content

Commit

Permalink
Update Makefile rules, now using cargo install routine
Browse files Browse the repository at this point in the history
- `./configure` run `rustup install` only if `cargo` is not in `PATH`
- Remove `kombucha` executable from YeAST default installation, moving it to his own repository
  • Loading branch information
Yvan Sraka committed Dec 28, 2018
1 parent 2cf6493 commit f4168d6
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "yeast"
version = "0.16.0"
version = "0.17.0"
authors = ["Yvan Sraka <[email protected]>"]

[dependencies]
Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ target/release/yeast:
cargo build --release

install: target/release/yeast
cp target/release/yeast /usr/local/bin/
cp kombucha /usr/local/bin/
cargo install --path .

clean:
cargo clean
Expand Down Expand Up @@ -35,3 +34,5 @@ test:
# Use $* for catching all args
cargo run tests/all_args.in foo bar | \
cmp tests/all_args.out

.PHONY: all target/release/yeast install test
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ IENY

## Roadmap

- [x] Create a Makefile to handle `make`, `make test` & `sudo make install` intructions.
- [x] Create a Makefile to handle `make`, `make test` & `make install` intructions.
- [x] Validate builds using Travis CI.
- [x] Read input file line by line using a Buffer.
- [x] Use [clap.rs](https://github.com/kbknapp/clap-rs) to enhance command line interactions.
Expand Down
5 changes: 4 additions & 1 deletion configure
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
#! /bin/sh
curl https://sh.rustup.rs -sSf | sh

if ! [ -x "$(command -v cargo)" ]; then
curl https://sh.rustup.rs -sSf | sh
fi
3 changes: 1 addition & 2 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
git clone https://github.com/yvan-sraka/YeAST /tmp/yeast-sources
pushd /tmp/yeast-sources
./configure
make
sudo make install
make install
popd
rm -rf /tmp/yeast-sources
8 changes: 0 additions & 8 deletions kombucha

This file was deleted.

0 comments on commit f4168d6

Please sign in to comment.