Rework zip package versioning

[src/xds/xds-cli.git] / Makefile

diff --git a/Makefile b/Makefile
index 7c26883..0e377e1 100644 (file)
--- 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,12 +83,13 @@ else
        BUILD_MODE="Release mode"
 endif
 
-
-ifeq ($(SUB_VERSION), )
-       PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).zip
+# Build Package name (model: <target>_<arch>-<version>.<nb_commit_from_last_tag>.zip)
+ifeq (-g,$(findstring -g,$(GIT_DESC)))
+       NB_COMMIT=$(firstword $(subst -, ,$(SUB_VERSION)))
 else
-       PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION)_$(SUB_VERSION).zip
+       NB_COMMIT=0
 endif
+PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).$(NB_COMMIT).zip
 
 .PHONY: all
 all: vendor build
@@ -113,7 +114,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 +165,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:"