X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=65dc031380c05bc79f832f501d1d0d233dd91c3a;hb=aabf2c598db74783e62e81e4ca008ce47fe130ba;hp=7c26883682a3da471bed85aa3d05c6d2885c4e19;hpb=7d1bcb1c9a48514e0e26246b86c8597502833b4b;p=src%2Fxds%2Fxds-cli.git

diff --git a/Makefile b/Makefile
index 7c26883..65dc031 100644
--- a/Makefile
+++ b/Makefile
@@ -16,13 +16,12 @@
 # limitations under the License.
 ###########################################################################
 
-
 # Application Name
 TARGET=xds-cli
 
 
 # Retrieve git tag/commit to set version & sub-version strings
-GIT_DESC := $(shell git describe --always --tags)
+GIT_DESC := $(shell git describe --always --tags --match "[0-9]*")
 VERSION := $(firstword $(subst -, ,$(GIT_DESC)))
 ifeq (-,$(findstring -,$(GIT_DESC)))
 	SUB_VERSION := $(subst $(VERSION)-,,$(GIT_DESC))
@@ -63,8 +62,9 @@ export PATH := $(PATH):$(LOCAL_TOOLSDIR)
 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))."
+CHECKGOVER := $(shell [ $(GOVERMAJ) -gt 1 -o \( $(GOVERMAJ) -eq 1 -a $(GOVERMIN) -ge 9 \) ] && echo true)
+CHECKERRMSG := "ERROR: Go version 1.9.0 or higher is requested (current detected version: $(GOVERSION)). \n\
+\t--> It may be necessary to clear glide cache with following command 'tools/linux/glide cc'"
 
 
 VERBOSE_1 := -v
@@ -83,11 +83,13 @@ else
 	BUILD_MODE="Release mode"
 endif
 
-
 ifeq ($(SUB_VERSION), )
 	PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).zip
 else
-	PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION)_$(SUB_VERSION).zip
+	# only use dot as separator to allow rpm packaging (see version .spec file)
+	PK_VER := $(subst _,.,$(subst -,,$(VERSION)))
+	PK_SBVER := $(subst _,.,$(subst -,,$(SUB_VERSION)))
+	PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(PK_VER).$(PK_SBVER).zip
 endif
 
 .PHONY: all
@@ -113,7 +115,7 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-	rm -rf $(LOCAL_BINDIR) $(ROOT_SRCDIR)/tools glide.lock vendor
+	rm -rf $(LOCAL_BINDIR) && (cd $(ROOT_SRCDIR) && rm -rf ./tools ./glide.lock ./vendor ./*.zip)
 
 
 .PHONY: scripts
@@ -164,23 +166,24 @@ tools/glide:
 	@test -f $(LOCAL_TOOLSDIR)/glide || { \
 		echo "Downloading glide"; \
 		mkdir -p $(LOCAL_TOOLSDIR); \
-		curl --silent -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR)  sh; \
+		curl --silent --connect-timeout 60 --retry 3 -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR)  sh; \
 	}
 
 .PHONY:
 checkgover:
-	@test "$(CHECKGOVER)" = "true" || { echo $(CHECKERRMSG); exit 1; }
+	@test "$(CHECKGOVER)" = "true" || { echo -e $(CHECKERRMSG); exit 1; }
 
 
 .PHONY: help
 help:
 	@echo "Main supported rules:"
-	@echo "  all               (default)"
+	@echo "  all                (default)"
 	@echo "  build"
 	@echo "  release"
-	@echo "  clean"
 	@echo "  package"
-	@echo "  install / uninstall"
+	@echo "  install"
+	@echo "  uninstall"
+	@echo "  clean"
 	@echo "  distclean"
 	@echo ""
 	@echo "Influential make variables:"