Calculate a sensible version for the current commit.

Author: jpeacock-zenoss

version.mk

@@ -1,11 +1,24 @@
-BRANCH_NAME = $(shell git name-rev --name-only HEAD)
+BRANCH_NAME = $(shell git rev-parse --abbrev-ref HEAD)
+
+ifeq ($(BRANCH_NAME),HEAD)
+NAME = $(shell git name-rev --name-only HEAD)
+NAME_PARTS = $(subst ~, ,$(subst ^, ,$(NAME)))
+ifeq ($(words $(NAME_PARTS)),1)
+TAG = 1
+else
+TAG = 0
+VERSION_BRANCH = $(shell git rev-parse --short HEAD)
+endif
+else
+TAG = 0
 UPSTREAM = $(shell git config --get branch.$(BRANCH_NAME).merge)
 ifeq ($(UPSTREAM),)
 BRANCH ?= $(BRANCH_NAME)
 else
 BRANCH ?= $(shell git rev-parse --symbolic-full-name --abbrev-ref @{upstream})
 endif
-VERSION_BRANCH = $(shell echo "$(BRANCH_NAME)" | tr A-Z-/ a-z.)
+VERSION_BRANCH = $(shell basename "$(BRANCH_NAME)" | tr A-Z-_ a-z.)
+endif  # for ifeq ($(BRANCH_NAME),HEAD)
 
 DESCRIBE = $(shell git describe --tags --long --always $(BRANCH))
 DESC_LIST = $(subst -, ,$(DESCRIBE))
@@ -18,13 +31,12 @@ SHA = $(word 1,$(DESC_LIST))
 endif
 
 REV_SUFFIX = $(or\
+	$(if $(findstring 1,$(TAG)),""),\
 	$(if $(findstring master,$(BRANCH)),""),\
 	$(if $(findstring develop,$(BRANCH)),.dev$(COUNT)),\
 	$(if $(findstring release/,$(BRANCH)),rc$(COUNT)),\
 	$(if $(findstring hotfix/,$(BRANCH)),rc$(COUNT)),\
-	$(if $(findstring feature/,$(BRANCH)),.dev$(COUNT)+$(VERSION_BRANCH)),\
-	$(if $(findstring bugfix/,$(BRANCH)),.dev$(COUNT)+$(VERSION_BRANCH)),\
-	.dev0+badbranch\
+	.dev$(COUNT)+$(VERSION_BRANCH)\
 )
 BASE_VERSION = $(shell cat VERSION)
 VERSION = $(BASE_VERSION)$(REV_SUFFIX)