From 1236a62eaee6e6c510e078dd33a566c2a8fb1257 Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Mon, 22 Oct 2018 09:10:53 +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. Change-Id: I3b8adddc410024062e1c713031507045b4adb70a Signed-off-by: Sebastien Douheret --- Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 1c6d405..cebe28e 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ 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,14 +82,13 @@ else BUILD_MODE="Release mode" 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: vendor build -- 2.16.6