X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Makefile;h=4a3b242e732f571655ca43377ca3f1ab55bdd101;hb=8b73700d11e380e300664b32aceb58d080371509;hp=4a8d51097ac70c7cb8e239258c2cef0e551428c8;hpb=a1f1eb9b68ada8b065313666bde78e6c515c9ad6;p=bytom%2Fbytom.git

diff --git a/Makefile b/Makefile
index 4a8d5109..4a3b242e 100644
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,13 @@ ifeq ($(UNAME_S),Darwin)
 else ifeq ($(UNAME_S),Linux)
 	GOOS := linux
 else
-$(error "$$GOOS is not defined.")
+$(error "$$GOOS is not defined. If you are using Windows, try to re-make using 'GOOS=windows make ...' ")
 endif
 endif
 
-PACKAGES    := $(shell go list ./... | grep -v '/vendor/')
+PACKAGES    := $(shell go list ./... | grep -v '/vendor/' | grep -v '/crypto/ed25519/chainkd' | grep -v '/mining/tensority')
+PACKAGES += 'github.com/bytom/mining/tensority/go_algorithm'
+
 BUILD_FLAGS := -ldflags "-X github.com/bytom/version.GitCommit=`git rev-parse HEAD`"
 
 MINER_BINARY32 := miner-$(GOOS)_386
@@ -35,16 +37,26 @@ 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"
 	@go build $(BUILD_FLAGS) -o cmd/bytomd/bytomd cmd/bytomd/main.go
 
+bytomd-simd:
+	@echo "Building SIMD version bytomd to cmd/bytomd/bytomd"
+	@cd mining/tensority/cgo_algorithm/lib/ && make
+	@go build -tags="simd" $(BUILD_FLAGS) -o cmd/bytomd/bytomd cmd/bytomd/main.go
+
 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 $@
 
@@ -80,11 +92,19 @@ release-all: clean
 	GOOS=windows make release
 
 clean:
-	@echo "Cleaning binaries built"
+	@echo "Cleaning binaries built..."
 	@rm -rf cmd/bytomd/bytomd
 	@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/
+	@echo "Cleaning sm2 pem files..."
+	@rm -rf crypto/sm2/*.pem
+	@echo "Done."
 
 target/$(BYTOMD_BINARY32):
 	CGO_ENABLED=0 GOARCH=386 go build $(BUILD_FLAGS) -o $@ cmd/bytomd/main.go
@@ -109,9 +129,11 @@ test:
 	@go test -tags "network" $(PACKAGES)
 
 benchmark:
-	go test -bench $(PACKAGES)
+	@go test -bench $(PACKAGES)
 
 functional-tests:
-	@go test -v -timeout=30m -tags=functional ./test
+	@go test -timeout=5m -tags="functional" ./test 
+
+ci: test functional-tests
 
 .PHONY: all target release-all clean test benchmark