Clean up Makefile (#2924)

Add missing deprecated targets.  Remove `test` from `check` target since
we already have `test-race`.

Fixes #2901

.travis.yml

@@ -12,12 +12,9 @@ matrix:
     - go: tip
   fast_finish: true
 install:
-  - make govendor
+  - make vendor
 script:
-  - make check
+  - make hugo-race check
-  # Test 64-bit alignment on 32-bit builds
-  - env GOARCH=386 make test
-  - go build -race
   - ./hugo -s docs/
   - ./hugo --renderToMemory -s docs/
 before_install:

Makefile

@@ -1,83 +1,80 @@
+# A Self-Documenting Makefile: http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
 
-# Adds build information from git repo
+PACKAGE = github.com/spf13/hugo
-#
+COMMIT_HASH = `git rev-parse --short HEAD 2>/dev/null`
-# as suggested by tatsushid in
+BUILD_DATE = `date +%FT%T%z`
-# https://github.com/spf13/hugo/issues/540
+LDFLAGS = -ldflags "-X ${PACKAGE}/hugolib.CommitHash=${COMMIT_HASH} -X ${PACKAGE}/hugolib.BuildDate=${BUILD_DATE}"
+NOGI_LDFLAGS = -ldflags "-X ${PACKAGE}/hugolib.BuildDate=${BUILD_DATE}"
 
-COMMIT_HASH=`git rev-parse --short HEAD 2>/dev/null`
+.PHONY: vendor docker check fmt lint test test-race vet test-cover-html help
-BUILD_DATE=`date +%FT%T%z`
+.DEFAULT_GOAL := help
-LDFLAGS=-ldflags "-X github.com/spf13/hugo/hugolib.CommitHash=${COMMIT_HASH} -X github.com/spf13/hugo/hugolib.BuildDate=${BUILD_DATE}"
-PACKAGES = $(shell govendor list -no-status +local | sed 's/github.com.spf13.hugo/./')
 
-all: gitinfo
+vendor: ## Install govendor and sync Hugo's vendored dependencies
+	go get github.com/kardianos/govendor
+	govendor sync ${PACKAGE}
 
-install: install-gitinfo
+hugo: vendor ## Build hugo binary
+	go build ${LDFLAGS} ${PACKAGE}
 
-help:
+hugo-race: vendor ## Build hugo binary with race detector enabled
-	echo ${COMMIT_HASH}
+	go build -race ${LDFLAGS} ${PACAGE}
-	echo ${BUILD_DATE}
 
-gitinfo:
+install: vendor ## Install hugo binary
-	go build ${LDFLAGS} -o hugo main.go
+	go install ${LDFLAGS} ${PACKAGE}
 
-install-gitinfo:
+hugo-no-gitinfo: LDFLAGS = ${NOGI_LDFLAGS}
-	go install ${LDFLAGS} ./...
+hugo-no-gitinfo: vendor hugo ## Build hugo without git info
 
-no-git-info:
+docker: ## Build hugo Docker container
-	go build -o hugo main.go
-
-docker:
 	docker build -t hugo .
 	docker rm -f hugo-build || true
 	docker run --name hugo-build hugo ls /go/bin
 	docker cp hugo-build:/go/bin/hugo .
 	docker rm hugo-build
 
-govendor:
+govendor: vendor # Deprecated: use "vendor" target
-	go get -u github.com/kardianos/govendor
+get: vendor # Deprecated: use "vendor"
-	go install github.com/kardianos/govendor
+gitinfo: hugo # Deprecated: use "hugo" target
-	govendor sync github.com/spf13/hugo
+install-gitinfo: install # Deprecated: use "install" target
+no-git-info: hugo-no-gitinfo # Deprecated: use "hugo-no-gitinfo" target
 
-check: fmt vet test test-race
+check: test-race test386 fmt vet ## Run tests and linters
 
-cyclo:
+test386: ## Run tests in 32-bit mode
-	@for d in `govendor list -no-status +local | sed 's/github.com.spf13.hugo/./'` ; do \
+	GOARCH=386 govendor test +local
-		if [ "`gocyclo -over 20 $$d | tee /dev/stderr`" ]; then \
-			echo "^ cyclomatic complexity exceeds 20, refactor the code!" && echo && exit 1; \
-		fi \
-	done
 
-fmt:
+test: ## Run tests
+	govendor test +local
+
+test-race: ## Run tests with race detector
+	govendor test -race +local
+
+fmt: ## Run gofmt linter
 	@for d in `govendor list -no-status +local | sed 's/github.com.spf13.hugo/./'` ; do \
 		if [ "`gofmt -l $$d/*.go | tee /dev/stderr`" ]; then \
 			echo "^ improperly formatted go files" && echo && exit 1; \
 		fi \
 	done
 
-lint:
+lint: ## Run golint linter
 	@for d in `govendor list -no-status +local | sed 's/github.com.spf13.hugo/./'` ; do \
 		if [ "`golint $$d | tee /dev/stderr`" ]; then \
 			echo "^ golint errors!" && echo && exit 1; \
 		fi \
 	done
 
-get:
+vet: ## Run go vet linter
-	go get -v -t ./...
-
-test:
-	govendor test +local
-
-test-race:
-	govendor test -race +local
-
-vet:
 	@if [ "`govendor vet +local | tee /dev/stderr`" ]; then \
 		echo "^ go vet errors!" && echo && exit 1; \
 	fi
 
-test-cover-html:
+test-cover-html: PACKAGES = $(shell govendor list -no-status +local | sed 's/github.com.spf13.hugo/./')
+test-cover-html: ## Generate test coverage report
 	echo "mode: count" > coverage-all.out
 	$(foreach pkg,$(PACKAGES),\
 		govendor test -coverprofile=coverage.out -covermode=count $(pkg);\
 		tail -n +2 coverage.out >> coverage-all.out;)
-	go tool cover -html=coverage-all.out
+	go tool cover -html=coverage-all.out
+
+help:
+	@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

appveyor.yml

@@ -13,16 +13,10 @@ install:
 
     pip install docutils
 build_script:
-- cmd: make govendor
+- cmd: make vendor
 test_script:
 - cmd: >-
-    make check
+    make hugo-race check
-
-    REM Test 64-bit alignment on 32-bit builds
-
-    set "GOARCH=386" & make test & set GOARCH=
-
-    go build -race
 
     hugo -s docs/