From babbf0635fc4a4232d5e6b1b784d3ae27f99ab5a Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Tue, 27 Feb 2018 17:44:20 +0100 Subject: [PATCH] Remove errant basecoin vendor mess --- Makefile | 2 +- examples/basecoin/Makefile | 11 ++--------- examples/basecoin/glide.yaml | 4 ---- 3 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 examples/basecoin/glide.yaml diff --git a/Makefile b/Makefile index 1e21c90a04..b89183b728 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,6 @@ gaia: build: @rm -rf examples/basecoin/vendor/ - cd examples/basecoin && $(MAKE) get_vendor_deps go build $(BUILD_FLAGS) -o build/basecoind ./examples/basecoin/cmd/basecoind/... dist: @@ -66,6 +65,7 @@ test_unit: @go test $(PACKAGES) test_cover: + @rm -rf examples/basecoin/vendor/ @bash tests/test_cover.sh benchmark: diff --git a/examples/basecoin/Makefile b/examples/basecoin/Makefile index 0196b9590c..dac7dd213d 100644 --- a/examples/basecoin/Makefile +++ b/examples/basecoin/Makefile @@ -1,22 +1,15 @@ PACKAGES=$(shell go list ./... | grep -v '/vendor/') BUILD_FLAGS = -ldflags "-X github.com/cosmos/cosmos-sdk/examples/basecoin/version.GitCommit=`git rev-parse --short HEAD`" -all: get_tools get_vendor_deps build test - -get_tools: - go get github.com/tendermint/glide +all: build test build: go build $(BUILD_FLAGS) -o build/basecoin ./cmd/... -get_vendor_deps: - @rm -rf vendor/ - @glide install - test: @go test $(PACKAGES) benchmark: @go test -bench=. $(PACKAGES) -.PHONY: get_tools build get_vendor_deps test benchmark +.PHONY: all build test benchmark diff --git a/examples/basecoin/glide.yaml b/examples/basecoin/glide.yaml deleted file mode 100644 index e8eae21cd6..0000000000 --- a/examples/basecoin/glide.yaml +++ /dev/null @@ -1,4 +0,0 @@ -package: github.com/cosmos/cosmos-sdk/examples/basecoin -import: -- package: github.com/cosmos/cosmos-sdk - version: develop