[tools] Update tools install scripts

This commit is contained in:
Florian Dehau 2017-10-30 22:14:25 +01:00
parent 3cc3585e48
commit 53d0001547
4 changed files with 51 additions and 38 deletions

View file

@ -30,45 +30,13 @@ help: ## Print all the available commands
# ================================ Tools ======================================
install: install-rustfmt install-clippy ## Install tools dependencies
install-tools: install-rustfmt install-clippy ## Install tools dependencies
RUSTFMT_TARGET_VERSION = 0.9.0
RUSTFMT = $(shell command -v rustfmt 2> /dev/null)
ifeq ("$(RUSTFMT)","")
RUSTFMT_INSTALL_CMD = @echo "Installing rustfmt $(RUSTFMT_TARGET_VERSION)" \
&& $(CARGO) install --vers $(RUSTFMT_TARGET_VERSION) --force rustfmt
else
RUSTFMT_CURRENT_VERSION = $(shell rustfmt --version | sed 's/^\(.*\) ()/\1/')
ifeq ($(RUSTFMT_CURRENT_VERSION),$(RUSTFMT_TARGET_VERSION))
RUSTFMT_INSTALL_CMD = @echo "Rustfmt is up to date"
else
RUSTFMT_INSTALL_CMD = @echo "Updating rustfmt from $(RUSTFMT_CURRENT_VERSION) to $(RUSTFMT_TARGET_VERSION)" \
&& $(CARGO) install --vers $(RUSTFMT_TARGET_VERSION) --force rustfmt
endif
endif
install-rustfmt: RUST_CHANNEL = nightly
install-rustfmt: ## Intall rustfmt
$(RUSTFMT_INSTALL_CMD)
./scripts/tools/rustfmt.sh
CLIPPY_TARGET_VERSION = 0.0.157
CLIPPY_CURRENT_VERSION = $(shell $(CARGO) clippy --version 2>/dev/null)
ifeq ("$(CLIPPY_CURRENT_VERSION)","")
CLIPPY_INSTALL_CMD = @echo "Installing clippy $(CLIPPY_TARGET_VERSION)" \
&& $(CARGO) install --vers $(CLIPPY_TARGET_VERSION) --force clippy
else
ifeq ($(CLIPPY_CURRENT_VERSION),$(CLIPPY_TARGET_VERSION))
CLIPPY_INSTALL_CMD = @echo "Clippy is up to date"
else
CLIPPY_INSTALL_CMD = @echo "Updating clippy from $(CLIPPY_CURRENT_VERSION) to $(CLIPPY_TARGET_VERSION)" \
&& $(CARGO) install --vers $(CLIPPY_TARGET_VERSION) --force clippy
endif
endif
install-clippy: RUST_CHANNEL = nightly
install-clippy: ## Install clippy
$(CLIPPY_INSTALL_CMD)
./scripts/tools/clippy.sh
# =============================== Build =======================================
@ -90,7 +58,8 @@ RUSTFMT_WRITEMODE ?= 'diff'
lint: fmt clippy ## Lint project files
fmt: ## Check the format of the source code
$(CARGO) fmt -- --write-mode=$(RUSTFMT_WRITEMODE)
rustfmt --write-mode=$(RUSTFMT_WRITEMODE) $(shell find src -type f -name "*.rs")
rustfmt --write-mode=$(RUSTFMT_WRITEMODE) $(shell find examples -type f -name "*.rs")
clippy: RUST_CHANNEL = nightly
clippy: ## Check the style of the source code and catch common errors
@ -132,4 +101,4 @@ beta: RUST_CHANNEL = beta
beta: build test ## Run build and tests for beta
nightly: RUST_CHANNEL = nightly
nightly: build lint test ## Run build, lint and tests for nightly
nightly: install-tools build lint test ## Run build, lint and tests for nightly

22
scripts/tools/clippy.sh Executable file
View file

@ -0,0 +1,22 @@
#!/bin/bash
set -eu -o pipefail
crate_name="clippy"
has_clippy=$(cargo +nightly install --list | { grep $crate_name || true; })
if [ -z "$has_clippy" ]; then
echo "WARN: $crate_name not found."
echo "INFO: Installing latest version from crates.io."
cargo +nightly install $crate_name
else
current_version=$(cargo +nightly clippy --version | cut -d '-' -f 1)
upstream_version=$(cargo +nightly search $crate_name | head -n 1 | cut -d ' ' -f 3 | tr -d '"')
if [ "$current_version" != "$upstream_version" ]; then
echo "WARN: New version of $crate_name available: $upstream_version (current=$current_version)"
echo "INFO: Installing latest version from crates.io."
cargo +nightly install $crate_name --force
else
echo "INFO: $crate_name is up to date"
fi
fi

22
scripts/tools/rustfmt.sh Executable file
View file

@ -0,0 +1,22 @@
#!/bin/bash
set -eu -o pipefail
crate_name="rustfmt-nightly"
has_rustfmt=$(cargo +nightly install --list | { grep $crate_name || true; })
if [ -z "$has_rustfmt" ]; then
echo "WARN: $crate_name not found."
echo "INFO: Installing latest version from crates.io."
cargo +nightly install $crate_name
else
current_version=$(rustfmt --version | cut -d '-' -f 1)
upstream_version=$(cargo +nightly search $crate_name| head -n 1 | cut -d ' ' -f 3 | tr -d '"')
if [ "$current_version" != "$upstream_version" ]; then
echo "WARN: New version of $crate_name available: $upstream_version (current=$current_version)"
echo "INFO: Installing latest version from crates.io."
cargo +nightly install $crate_name --force
else
echo "INFO: $crate_name is up to date"
fi
fi

View file

@ -4,5 +4,5 @@ set -eu
export PATH="$PATH:$HOME/.cargo/bin"
if [[ "$TRAVIS_RUST_VERSION" == "nightly" ]]; then
make install
make install-tools
fi