Rework zip package versioning

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

diff --git a/Makefile b/Makefile
index 65dc031..0e377e1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -83,14 +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
-       # 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
+       NB_COMMIT=0
 endif
+PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).$(NB_COMMIT).zip
 
 .PHONY: all
 all: vendor build