add vaildate-block

[bytom/bytom.git] / Makefile

diff --git a/Makefile b/Makefile
index d62cb4b..d54f632 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,9 +10,9 @@ endif
 endif
 
 PACKAGES    := $(shell go list ./... | grep -v '/vendor/' | grep -v '/crypto/ed25519/chainkd' | grep -v '/mining/tensority')
-PACKAGES += 'github.com/bytom/mining/tensority/go_algorithm'
+PACKAGES += 'github.com/bytom/bytom/mining/tensority/go_algorithm'
 
-BUILD_FLAGS := -ldflags "-X github.com/bytom/version.GitCommit=`git rev-parse HEAD`"
+BUILD_FLAGS := -ldflags "-X github.com/bytom/bytom/version.GitCommit=`git rev-parse HEAD`"
 
 MINER_BINARY32 := miner-$(GOOS)_386
 MINER_BINARY64 := miner-$(GOOS)_amd64
@@ -37,7 +37,7 @@ BYTOMCLI_RELEASE64 := bytomcli-$(VERSION)-$(GOOS)_amd64
 BYTOM_RELEASE32 := bytom-$(VERSION)-$(GOOS)_386
 BYTOM_RELEASE64 := bytom-$(VERSION)-$(GOOS)_amd64
 
-all: test target release-all
+all: test target release-all install
 
 bytomd:
        @echo "Building bytomd to cmd/bytomd/bytomd"
@@ -52,6 +52,11 @@ bytomcli:
        @echo "Building bytomcli to cmd/bytomcli/bytomcli"
        @go build $(BUILD_FLAGS) -o cmd/bytomcli/bytomcli cmd/bytomcli/main.go
 
+install:
+       @echo "Installing bytomd and bytomcli to $(GOPATH)/bin"
+       @go install ./cmd/bytomd
+       @go install ./cmd/bytomcli
+
 target:
        mkdir -p $@
 
@@ -92,6 +97,8 @@ clean:
        @rm -rf cmd/bytomcli/bytomcli
        @rm -rf cmd/miner/miner
        @rm -rf target
+       @rm -rf $(GOPATH)/bin/bytomd
+       @rm -rf $(GOPATH)/bin/bytomcli
        @echo "Cleaning temp test data..."
        @rm -rf test/pseudo_hsm*
        @rm -rf blockchain/pseudohsm/testdata/pseudo/
@@ -125,7 +132,7 @@ benchmark:
        @go test -bench $(PACKAGES)
 
 functional-tests:
-       @go test -v -timeout=5m -tags="functional" ./test 
+       @go test -timeout=5m -tags="functional" ./test 
 
 ci: test functional-tests