From 8fcd71920afb6666562bc9a085a0a1532fd07b2a Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Tue, 28 Apr 2015 12:06:59 +0200 Subject: Makefile: clean should also delete Godeps/_workspace/pkg --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1fdc36f98..09e80ea26 100644 --- a/Makefile +++ b/Makefile @@ -19,4 +19,4 @@ mist: @echo "Run \"$(GOBIN)/mist --asset_path=cmd/mist/assets\" to launch mist." clean: - rm -fr build/_workspace/pkg/ $(GOBIN)/* + rm -fr build/_workspace/pkg/ Godeps/_workspace/pkg $(GOBIN)/* -- cgit v1.2.3 From 71c28cfb0c62c90c6881e4a9b857f8c8f692b5e6 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Tue, 28 Apr 2015 12:53:50 +0200 Subject: Makefile: set main.gitCommit when building --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 09e80ea26..bb9609d58 100644 --- a/Makefile +++ b/Makefile @@ -9,12 +9,12 @@ GOBIN = build/bin geth: - build/env.sh go install -v github.com/ethereum/go-ethereum/cmd/geth + build/env.sh go install -v $(shell build/ldflags.sh) ./cmd/geth @echo "Done building." @echo "Run \"$(GOBIN)/geth\" to launch geth." mist: - build/env.sh go install -v github.com/ethereum/go-ethereum/cmd/mist + build/env.sh go install -v $(shell build/ldflags.sh) ./cmd/mist @echo "Done building." @echo "Run \"$(GOBIN)/mist --asset_path=cmd/mist/assets\" to launch mist." -- cgit v1.2.3 From c6b983e449ec97d902f263cd693cf615b790542a Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Tue, 28 Apr 2015 13:16:47 +0200 Subject: Makefile: add test target --- Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index bb9609d58..917e7f4ac 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,8 @@ # This Makefile is meant to be used by people that do not usually work # with Go source code. If you know what GOPATH is then you probably # don't need to bother with make. -# -# Note that there is no way to run the tests or do anything other than -# building the binaries. This is by design. -.PHONY: geth mist clean +.PHONY: geth mist test clean GOBIN = build/bin geth: @@ -18,5 +15,11 @@ mist: @echo "Done building." @echo "Run \"$(GOBIN)/mist --asset_path=cmd/mist/assets\" to launch mist." +all: + build/env.sh go install -v $(shell build/ldflags.sh) ./... + +test: all + build/env.sh go test ./... + clean: rm -fr build/_workspace/pkg/ Godeps/_workspace/pkg $(GOBIN)/* -- cgit v1.2.3 From aa03e53ca8d55e74e562f5f56d90e4fd2579fb4e Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Wed, 29 Apr 2015 01:27:47 +0200 Subject: Use Makefile for Travis tests --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 917e7f4ac..03e3bf4c6 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # with Go source code. If you know what GOPATH is then you probably # don't need to bother with make. -.PHONY: geth mist test clean +.PHONY: geth mist all test travis-test-with-coverage clean GOBIN = build/bin geth: @@ -21,5 +21,8 @@ all: test: all build/env.sh go test ./... +travis-test-with-coverage: all + build/env.sh build/test-global-coverage.sh + clean: rm -fr build/_workspace/pkg/ Godeps/_workspace/pkg $(GOBIN)/* -- cgit v1.2.3