From 7939184660ed562f4b41c7a3983c7a4f69da52c7 Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Sun, 21 Oct 2018 21:59:12 +0200 Subject: [PATCH] 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: I923ff924ae79593612b39c917e9f52d1a4875276 Signed-off-by: Sebastien Douheret --- Makefile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index f0ae0b3..a91af3f 100644 --- 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)) @@ -100,16 +100,15 @@ else WEBAPP_BUILD_RULE=build:prod endif -ifeq ($(SUB_VERSION), ) - PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).zip +# Build Package name (model: _-..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: tools/syncthing build .PHONY: build -- 2.16.6