build: Add spelling checks and check if curl is installed.

master
Harshavardhana 9 years ago
parent 9b29af8bbe
commit 98ee5fcf55
  1. 15
      Makefile
  2. 6
      buildscripts/checkdeps.sh

@ -26,6 +26,7 @@ getdeps: checkdeps checkgopath
@go get -u golang.org/x/tools/cmd/vet && echo "Installed vet:" @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/fzipp/gocyclo && echo "Installed gocyclo:"
@go get -u github.com/remyoudompheng/go-misc/deadcode && echo "Installed deadcode:" @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): $(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:" @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 $@:" @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." @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: vet:
@echo "Running $@:" @echo "Running $@:"
@ -61,7 +62,11 @@ build: getdeps verifiers $(UI_ASSETS)
@echo "Installing minio:" @echo "Installing minio:"
deadcode: deadcode:
@GO15VENDOREXPERIMENT=1 deadcode @GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/deadcode
spelling:
@GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/misspell *.go
@GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/misspell pkg/**/*
test: build test: build
@echo "Running all testing:" @echo "Running all testing:"
@ -72,13 +77,13 @@ gomake-all: build
@GO15VENDOREXPERIMENT=1 go build --ldflags $(BUILD_LDFLAGS) -o $(GOPATH)/bin/minio @GO15VENDOREXPERIMENT=1 go build --ldflags $(BUILD_LDFLAGS) -o $(GOPATH)/bin/minio
pkg-add: pkg-add:
@GO15VENDOREXPERIMENT=1 govendor add $(PKG) @GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/govendor add $(PKG)
pkg-update: pkg-update:
@GO15VENDOREXPERIMENT=1 govendor update $(PKG) @GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/govendor update $(PKG)
pkg-remove: pkg-remove:
@GO15VENDOREXPERIMENT=1 govendor remove $(PKG) @GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/govendor remove $(PKG)
install: gomake-all install: gomake-all

@ -21,6 +21,7 @@ _init() {
## Minimum required versions for build dependencies ## Minimum required versions for build dependencies
GIT_VERSION="1.0" GIT_VERSION="1.0"
CURL_VERSION="7.12.0"
GPG_VERSION="1.3" GPG_VERSION="1.3"
GO_VERSION="1.5.1" GO_VERSION="1.5.1"
OSX_VERSION="10.8" OSX_VERSION="10.8"
@ -186,6 +187,11 @@ check_deps() {
if [ $? -ge 2 ]; then if [ $? -ge 2 ]; then
MISSING="${MISSING} gpg" MISSING="${MISSING} gpg"
fi 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() { main() {

Loading…
Cancel
Save