OSDN Git Service
(root)
/
bytom
/
vapor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add mac function, modify nextBlockTime (#122)
[bytom/vapor.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
4a3b242
..
b81530d
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-10,9
+10,8
@@
endif
endif
PACKAGES := $(shell go list ./... | grep -v '/vendor/' | grep -v '/crypto/ed25519/chainkd' | grep -v '/mining/tensority')
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'
-BUILD_FLAGS := -ldflags "-X github.com/
bytom
/version.GitCommit=`git rev-parse HEAD`"
+BUILD_FLAGS := -ldflags "-X github.com/
vapor
/version.GitCommit=`git rev-parse HEAD`"
MINER_BINARY32 := miner-$(GOOS)_386
MINER_BINARY64 := miner-$(GOOS)_amd64
MINER_BINARY32 := miner-$(GOOS)_386
MINER_BINARY64 := miner-$(GOOS)_amd64
@@
-39,6
+38,10
@@
BYTOM_RELEASE64 := bytom-$(VERSION)-$(GOOS)_amd64
all: test target release-all install
all: test target release-all install
+fedd:
+ @echo "Building fedd to cmd/fedd/fedd"
+ @go build $(BUILD_FLAGS) -o cmd/fedd/fedd cmd/fedd/main.go
+
bytomd:
@echo "Building bytomd to cmd/bytomd/bytomd"
@go build $(BUILD_FLAGS) -o cmd/bytomd/bytomd cmd/bytomd/main.go
bytomd:
@echo "Building bytomd to cmd/bytomd/bytomd"
@go build $(BUILD_FLAGS) -o cmd/bytomd/bytomd cmd/bytomd/main.go
@@
-134,6
+137,6
@@
benchmark:
functional-tests:
@go test -timeout=5m -tags="functional" ./test
functional-tests:
@go test -timeout=5m -tags="functional" ./test
-ci: test
functional-tests
+ci: test
.PHONY: all target release-all clean test benchmark
.PHONY: all target release-all clean test benchmark