From fa4dd5b6cdaff7173b24eafe2d2f22a4905aac39 Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Thu, 30 Nov 2017 16:28:36 +0100 Subject: [PATCH] Check go version because xds-common request go > v1.8.1 --- Makefile | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f786abd..0088519 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,9 @@ TARGET=xds-gdb # Retrieve git tag/commit to set version & sub-version strings GIT_DESC := $(shell git describe --always --tags) VERSION := $(firstword $(subst -, ,$(GIT_DESC))) -SUB_VERSION := $(subst $(VERSION)-,,$(GIT_DESC)) +ifeq (-,$(findstring -,$(GIT_DESC))) + SUB_VERSION := $(subst $(VERSION)-,,$(GIT_DESC)) +endif ifeq ($(VERSION), ) VERSION := unknown-dev endif @@ -56,6 +58,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 @@ -83,7 +93,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)" . @@ -104,6 +114,10 @@ clean: distclean: clean rm -rf $(LOCAL_BINDIR) $(ROOT_SRCDIR)/tools glide.lock vendor $(ROOT_SRCDIR)/*.zip +.PHONY: scripts +scripts: + @mkdir -p $(LOCAL_BINDIR) && cp -rf scripts/*.sh scripts/xds-utils $(LOCAL_BINDIR) + .PHONY: release release: RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile clean build @@ -149,6 +163,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)" -- 2.16.6