From f9718b0eb4fc09d52968c76c2be1432b7043c8d9 Mon Sep 17 00:00:00 2001 From: Frank Yang Date: Mon, 29 Apr 2019 22:47:43 +0800 Subject: [PATCH] Fix dependency of devtools Makefile and clean code. (#4223) 1. `make tools` will not updated `clog` when `clog/main.go` was changed, except `${GOBIN}/clog` or `tools-stamp` was deleted. `gosum` has the same problem. 2. $(GOBIN)/gosum was just like magic number. --- contrib/devtools/Makefile | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/contrib/devtools/Makefile b/contrib/devtools/Makefile index 7bee314b51..aede32c4e2 100644 --- a/contrib/devtools/Makefile +++ b/contrib/devtools/Makefile @@ -41,29 +41,36 @@ mkfile_dir := $(shell cd $(shell dirname $(mkfile_path)); pwd) ### # tools ### + +GOLANGCI_LINT = $(GOBIN)/golangci-lint +STATIK = $(GOBIN)/statik +GOIMPORTS = $(GOBIN)/goimports +GOSUM = $(GOBIN)/gosum +CLOG = $(GOBIN)/clog + all: tools tools: tools-stamp -tools-stamp: $(GOBIN)/golangci-lint $(GOBIN)/statik $(GOBIN)/goimports $(GOBIN)/gosum $(GOBIN)/clog +tools-stamp: $(GOLANGCI_LINT) $(STATIK) $(GOIMPORTS) $(GOSUM) $(CLOG) touch $@ -$(GOBIN)/golangci-lint: $(mkfile_dir)/install-golangci-lint.sh $(GOBIN)/gosum +$(GOLANGCI_LINT): $(mkfile_dir)/install-golangci-lint.sh $(GOSUM) bash $(mkfile_dir)/install-golangci-lint.sh $(GOBIN) $(GOLANGCI_LINT_VERSION) $(GOLANGCI_LINT_HASHSUM) -$(GOBIN)/statik: +$(STATIK): $(call go_install,rakyll,statik,v0.1.5) -$(GOBIN)/goimports: +$(GOIMPORTS): go get golang.org/x/tools/cmd/goimports@v0.0.0-20190114222345-bf090417da8b -$(GOBIN)/gosum: - go install -mod=readonly github.com/cosmos/cosmos-sdk/contrib/devtools/gosum/ +$(GOSUM): ./contrib/devtools/gosum/main.go + go install -mod=readonly ./$(