From c4c42a5fe7a61407f3de073ad3cb87cb5b3681ca Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Thu, 30 Nov 2017 15:59:00 +0100 Subject: Check go version because xds-common request go > v1.8.1 --- .gitignore | 1 + Makefile | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3c55464..2f4d998 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ bin/** tools/** vendor/** *.zip +__* diff --git a/Makefile b/Makefile index 1b56896..02cb6ec 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,9 @@ TARGET=xds-cli # Retrieve git tag/commit to set version & sub-version strings GIT_DESC := $(shell git describe --always --tags) VERSION := $(firstword $(subst -, ,$(GIT_DESC))) +ifeq (-,$(findstring -,$(GIT_DESC))) SUB_VERSION := $(subst $(VERSION)-,,$(GIT_DESC)) +endif ifeq ($(VERSION), ) VERSION := unknown-dev endif @@ -40,6 +42,14 @@ PACKAGE_DIR := $(ROOT_SRCDIR)/package export GOPATH := $(shell go env GOPATH):$(ROOT_GOPRJ) export PATH := $(PATH):$(LOCAL_TOOLSDIR) +# Check Go version +GOVERSION := $(shell go version |grep -o '[0-9\.]*'|head -n 1) +GOVERMAJ := $(shell echo $(GOVERSION) |cut -f1 -d.) +GOVERMIN := $(shell echo $(GOVERSION) |cut -f2 -d.) +CHECKGOVER := $(shell [ $(GOVERMAJ) -gt 1 -o \( $(GOVERMAJ) -eq 1 -a $(GOVERMIN) -ge 8 \) ] && echo true) +CHECKERRMSG := "ERROR: Go version 1.8.1 or higher is requested (current detected version: $(GOVERSION))." + + VERBOSE_1 := -v VERBOSE_2 := -v -x @@ -67,7 +77,7 @@ endif all: vendor build .PHONY: build -build: +build: checkgover @echo "### Build $(TARGET) (version $(VERSION), subversion $(SUB_VERSION) - $(BUILD_MODE))"; @cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/$(TARGET)$(EXT) -ldflags "$(GO_LDFLAGS) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" -gcflags "$(GO_GCFLAGS)" . @@ -138,6 +148,12 @@ tools/glide: curl --silent -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR) sh; \ } +.PHONY: +checkgover: + @test "$(CHECKGOVER)" = "true" || { echo $(CHECKERRMSG); exit 1; } + + +.PHONY: help help: @echo "Main supported rules:" @echo " all (default)" -- cgit 1.2.3-korg