From b6770332eadedf14cd9ab2e74478b5223c840767 Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Mon, 6 Nov 2017 14:58:09 +0100 Subject: [PATCH] Extract version from git tag. Signed-off-by: Sebastien Douheret --- Makefile | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index d546961..8b190c8 100644 --- a/Makefile +++ b/Makefile @@ -1,26 +1,16 @@ -# Makefile used to build XDS daemon Web Server - -# Application Version -VERSION := 0.3.2 +# Makefile used to build XDS Server # 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 # for backward compatibility -- 2.16.6