From 98ee5fcf554a4d58cca59ad53b22410a5e9d85e8 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Tue, 9 Feb 2016 21:51:03 -0800 Subject: [PATCH] build: Add spelling checks and check if curl is installed. --- Makefile | 15 ++++++++++----- buildscripts/checkdeps.sh | 6 ++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 3f46bf666..6ea1ca3ba 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,7 @@ getdeps: checkdeps checkgopath @go get -u golang.org/x/tools/cmd/vet && echo "Installed vet:" @go get -u github.com/fzipp/gocyclo && echo "Installed gocyclo:" @go get -u github.com/remyoudompheng/go-misc/deadcode && echo "Installed deadcode:" + @go get -u github.com/client9/misspell/cmd/misspell && echo "Installed misspell:" $(UI_ASSETS): @curl -s https://dl.minio.io/assets/server/$(UI_ASSETS_ARMOR) 2>&1 > $(UI_ASSETS_ARMOR) && echo "Downloading signature file $(UI_ASSETS_ARMOR) for verification:" @@ -33,7 +34,7 @@ $(UI_ASSETS): @curl -s https://dl.minio.io/assets/server/$@ 2>&1 > $@ && echo "Downloading UI assets file $@:" @gpg --batch --no-tty --verify $(UI_ASSETS_ARMOR) $@ 2>&1 > /dev/null && echo "Verifying signature of downloaded assets." -verifiers: getdeps vet fmt lint cyclo +verifiers: getdeps vet fmt lint cyclo spelling vet: @echo "Running $@:" @@ -61,7 +62,11 @@ build: getdeps verifiers $(UI_ASSETS) @echo "Installing minio:" deadcode: - @GO15VENDOREXPERIMENT=1 deadcode + @GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/deadcode + +spelling: + @GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/misspell *.go + @GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/misspell pkg/**/* test: build @echo "Running all testing:" @@ -72,13 +77,13 @@ gomake-all: build @GO15VENDOREXPERIMENT=1 go build --ldflags $(BUILD_LDFLAGS) -o $(GOPATH)/bin/minio pkg-add: - @GO15VENDOREXPERIMENT=1 govendor add $(PKG) + @GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/govendor add $(PKG) pkg-update: - @GO15VENDOREXPERIMENT=1 govendor update $(PKG) + @GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/govendor update $(PKG) pkg-remove: - @GO15VENDOREXPERIMENT=1 govendor remove $(PKG) + @GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/govendor remove $(PKG) install: gomake-all diff --git a/buildscripts/checkdeps.sh b/buildscripts/checkdeps.sh index bcb40c85f..00ef05c9f 100644 --- a/buildscripts/checkdeps.sh +++ b/buildscripts/checkdeps.sh @@ -21,6 +21,7 @@ _init() { ## Minimum required versions for build dependencies GIT_VERSION="1.0" + CURL_VERSION="7.12.0" GPG_VERSION="1.3" GO_VERSION="1.5.1" OSX_VERSION="10.8" @@ -186,6 +187,11 @@ check_deps() { if [ $? -ge 2 ]; then MISSING="${MISSING} gpg" fi + + check_version "$(env curl --version 2>/dev/null | sed -e 's/^.* \([0-9.\].*\).*$/\1/' -e 's/^\([0-9.\]*\).*/\1/g' | head -1)" "${CURL_VERSION}" + if [ $? -ge 2 ]; then + MISSING="${MISSING} curl" + fi } main() {