X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=cebe28e79c116fcf73ed53f62f52c6f9d1fbd8c0;hb=1236a62eaee6e6c510e078dd33a566c2a8fb1257;hp=37b64ba44b7ec5e0393951462c5c7721c037d044;hpb=27bb4e3044b2e8983a6938936baf658b629a443d;p=src%2Fxds%2Fxds-gdb.git

diff --git a/Makefile b/Makefile
index 37b64ba..cebe28e 100644
--- a/Makefile
+++ b/Makefile
@@ -16,12 +16,12 @@
 # limitations under the License.
 ###########################################################################
 
-
 # Application Name
 TARGET=xds-gdb
 
+
 # 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))
@@ -82,12 +82,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
@@ -112,7 +113,8 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-	rm -rf $(LOCAL_BINDIR) $(ROOT_SRCDIR)/tools glide.lock vendor $(ROOT_SRCDIR)/*.zip
+	rm -rf $(LOCAL_BINDIR) && (cd $(ROOT_SRCDIR) && rm -rf ./tools ./glide.lock ./vendor ./*.zip)
+
 
 .PHONY: scripts
 scripts:
@@ -155,30 +157,31 @@ vendor: tools/glide glide.yaml
 vendor/debug: vendor
 	(cd vendor/gerrit.automotivelinux.org/gerrit/src/xds && \
 		rm -rf xds-common.git && ln -s ../../../../../../xds-common xds-common.git && \
-		rm -rf xds-agent.git && ln -s ../../../../../../xds-agent xds-agent.git )
+		rm -rf xds-agent.git && ln -s ../../../../../../xds-agent xds-agent.git)
 
 .PHONY: tools/glide
 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:"