Merge pull request #935 from Bytom/dev

[bytom/bytom.git] / Makefile

diff --git a/Makefile b/Makefile
index 7571c95..da282ce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,11 @@ 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')
 BUILD_FLAGS := -ldflags "-X github.com/bytom/version.GitCommit=`git rev-parse HEAD`"
 
 MINER_BINARY32 := miner-$(GOOS)_386
@@ -39,11 +39,11 @@ all: test target release-all
 
 bytomd:
        @echo "Building bytomd to cmd/bytomd/bytomd"
-       go build $(BUILD_FLAGS) -o cmd/bytomd/bytomd cmd/bytomd/main.go
+       @go build $(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
+       @go build $(BUILD_FLAGS) -o cmd/bytomcli/bytomcli cmd/bytomcli/main.go
 
 target:
        mkdir -p $@
@@ -80,7 +80,11 @@ release-all: clean
        GOOS=windows make release
 
 clean:
-       rm -rf target
+       @echo "Cleaning binaries built"
+       @rm -rf cmd/bytomd/bytomd
+       @rm -rf cmd/bytomcli/bytomcli
+       @rm -rf cmd/miner/miner
+       @rm -rf target
 
 target/$(BYTOMD_BINARY32):
        CGO_ENABLED=0 GOARCH=386 go build $(BUILD_FLAGS) -o $@ cmd/bytomd/main.go
@@ -107,4 +111,9 @@ test:
 benchmark:
        go test -bench $(PACKAGES)
 
+functional-tests:
+       @go test -v -timeout=5m -tags=functional ./test
+
+ci: test functional-tests
+
 .PHONY: all target release-all clean test benchmark