Rework zip package versioning

In order to always have a number that's incrementing, use git commits
number for last detected tag.
Also update command used to extract version from tag in order to bypass
problem describe in issue SPEC-1782.

Change-Id: Ie5ec7812f9d70c19444e48aee31b135566114c2f
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>

diff --git a/Makefile b/Makefile
index dc185a7..cde2698 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ SYNCTHING_INOTIFY_VERSION = 0.8.7
 
 
 # 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))
@@ -92,14 +92,13 @@ else
        WEBAPP_BUILD_RULE=build:prod
 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
 
 
 all: tools/syncthing build