make install now uses vendored dependencies

This commit is contained in:
Ethan Frey 2017-02-08 19:28:25 +01:00
parent 1aceeb7116
commit d4b3dde853

View File

@ -5,9 +5,9 @@ PACKAGES=$(shell go list ./... | grep -v '/vendor/')
BUILD_TAGS?=tendermint BUILD_TAGS?=tendermint
TMROOT = $${TMROOT:-$$HOME/.tendermint} TMROOT = $${TMROOT:-$$HOME/.tendermint}
all: get_deps install test all: install test
install: get_deps install: get_vendor_deps
@go install ./cmd/tendermint @go install ./cmd/tendermint
build: build:
@ -50,12 +50,12 @@ get_deps:
grep -v /vendor/ | sort | uniq | \ grep -v /vendor/ | sort | uniq | \
xargs go get -d xargs go get -d
get_vendor_deps: tools get_vendor_deps: ensure_tools
@rm -rf vendor/ @rm -rf vendor/
@echo "--> Running glide install" @echo "--> Running glide install"
@glide install @glide install
update_deps: update_deps: tools
@echo "--> Updating dependencies" @echo "--> Updating dependencies"
@go get -d -u ./... @go get -d -u ./...
@ -66,4 +66,8 @@ revision:
tools: tools:
go get -u -v $(GOTOOLS) go get -u -v $(GOTOOLS)
ensure_tools:
go get $(GOTOOLS)
.PHONY: install build build_race dist test test_race test_integrations test100 draw_deps list_deps get_deps get_vendor_deps update_deps revision tools .PHONY: install build build_race dist test test_race test_integrations test100 draw_deps list_deps get_deps get_vendor_deps update_deps revision tools