summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2017-10-20 19:01:29 +0200
committerSebastien Douheret <sebastien.douheret@iot.bzh>2017-10-20 19:01:29 +0200
commit4afc24d8b2894ca49035a4d5fa04ab2c91dc0ede (patch)
tree654a7e23fbdc9710cdf37e8ca39a02a552cef98f
parent2d90eac319979dba64371258b30e61e77a15db7d (diff)
Extract version from git tag.
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
-rw-r--r--Makefile24
1 files changed, 7 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index db4d874..51e1795 100644
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,16 @@
-# Makefile used to build XDS daemon Web Server
-
-# Application Version
-VERSION := 0.2.0
+# Makefile used to build XDS Agent
# Syncthing version to install
SYNCTHING_VERSION = 0.14.38
SYNCTHING_INOTIFY_VERSION = 0.8.7
-# Retrieve git tag/commit to set sub-version string
-ifeq ($(origin SUB_VERSION), undefined)
- SUB_VERSION := $(shell git describe --exact-match --tags 2>/dev/null | sed 's/^v//')
- ifneq ($(SUB_VERSION), )
- VERSION := $(firstword $(subst -, ,$(SUB_VERSION)))
- SUB_VERSION := $(word 2,$(subst -, ,$(SUB_VERSION)))
- endif
- ifeq ($(SUB_VERSION), )
- SUB_VERSION := $(shell git rev-parse --short HEAD)
- ifeq ($(SUB_VERSION), )
- SUB_VERSION := unknown-dev
- endif
- endif
+# Retrieve git tag/commit to set version & sub-version strings
+GIT_DESC := $(shell git describe --always --tags)
+VERSION := $(firstword $(subst -, ,$(GIT_DESC)))
+SUB_VERSION := $(subst $(VERSION)-,,$(GIT_DESC))
+ifeq ($(VERSION), )
+ VERSION := unknown-dev
endif
# Configurable variables for installation (default /opt/AGL/...)