diff options
| author |   Sebastien Douheret <sebastien.douheret@iot.bzh> | 2018-10-21 22:04:33 +0200 |
|---|---|---|
| committer | Sebastien Douheret <sebastien.douheret@iot.bzh> | 2018-10-22 12:17:03 +0000 |
| commit | 7185530f29f303d790e6be1e5ba3c71346516d89 (patch) | |
| tree | 67eb41a60bdf9c1c05ae61662577ae25aee58bd1 | |
| parent | d48bd52ad18deb341ead19fde66093970bef1de1 (diff) | |
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>
| -rw-r--r-- | Makefile | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -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 |