summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
777f883)
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 <sebastien.douheret@iot.bzh>
# Retrieve git tag/commit to set version & sub-version strings
# 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))
VERSION := $(firstword $(subst -, ,$(GIT_DESC)))
ifeq (-,$(findstring -,$(GIT_DESC)))
SUB_VERSION := $(subst $(VERSION)-,,$(GIT_DESC))
WEBAPP_BUILD_RULE=build:prod
endif
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)))
- # 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
+PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).$(NB_COMMIT).zip
all: tools/syncthing build
.PHONY: build
all: tools/syncthing build
.PHONY: build