status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'go' into devel

This commit is contained in:
Ștefan Talpalaru 2019-07-11 18:02:59 +02:00
parent bfeb649892 6bcf4effbb
commit 2a191c5df2
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -49,7 +49,7 @@ TOOLS_DIRS := premix tests
# comma-separated values for the "clean" target # comma-separated values for the "clean" target
TOOLS_CSV := $(subst $(SPACE),$(COMMA),$(TOOLS)) TOOLS_CSV := $(subst $(SPACE),$(COMMA),$(TOOLS))
.PHONY: all $(TOOLS) deps sanity-checks github-ssh build-nim update status ntags ctags nimbus testsuite test clean mrproper fetch-dlls test-libp2p-daemon nat-libs libminiupnpc.a libnatpmp.a .PHONY: all $(TOOLS) deps sanity-checks github-ssh build-nim update status ntags ctags nimbus testsuite test clean mrproper fetch-dlls test-libp2p-daemon nat-libs libminiupnpc.a libnatpmp.a go-checks
# default target, because it's the first one that doesn't start with '.' # default target, because it's the first one that doesn't start with '.'
all: $(TOOLS) nimbus all: $(TOOLS) nimbus
@ -180,7 +180,14 @@ status: | $(REPOS)
$(eval CMD := $(GIT_STATUS)) $(eval CMD := $(GIT_STATUS))
$(RUN_CMD_IN_ALL_REPOS) $(RUN_CMD_IN_ALL_REPOS)
vendor/go/bin/p2pd: MIN_GO_VER := 1.12.0
go-checks:
which go &>/dev/null || { echo "Go compiler not installed. Aborting."; exit 1; }
GO_VER="$$(go version | sed 's/^.*go\(\S\+\).*$$/\1/')"; \
[[ $$(echo -e "$${GO_VER}\n$(MIN_GO_VER)" | sort -t '.' -k 1,1 -k 2,2 -k 3,3 -g | head -n 1) == "$(MIN_GO_VER)" ]] || \
{ echo "Minimum Go compiler version required: $(MIN_GO_VER). Version available: $$GO_VER. Aborting."; exit 1; }
vendor/go/bin/p2pd: | go-checks
cd vendor/go/src/github.com/libp2p/go-libp2p-daemon && \ cd vendor/go/src/github.com/libp2p/go-libp2p-daemon && \
$(ENV_SCRIPT) go get ./... && \ $(ENV_SCRIPT) go get ./... && \
$(ENV_SCRIPT) go install ./... $(ENV_SCRIPT) go install ./...