From a842a69c16f9d2ce8e41c77b727b8252e4d7a5fe Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Thu, 2 Apr 2015 23:42:16 +0200
Subject: allow to prefix tags with “<text>+”
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

eg. mixbus+3.0 or mb+3.1-rc1
---
 tools/x-win/package.sh | 4 ++--
 wscript                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh
index 610830f934..221a07bba4 100755
--- a/tools/x-win/package.sh
+++ b/tools/x-win/package.sh
@@ -76,9 +76,9 @@ test -f ${SRCDIR}/$1 || curl -k -L -o ${SRCDIR}/$1 $2
 ################################################################################
 set -e
 
-ARDOURVERSION=$(git describe | sed 's/-g.*$//')
+ARDOURVERSION=$(git describe | sed 's/^[A-Za-z]*+//;s/-g.*$//')
 ARDOURDATE=$(date -R)
-BINVERSION=$(git describe | sed 's/-g.*$//;s/\-rc\([^-]*\)-/-rc\1./;s/-/./;s/-.*$//')
+BINVERSION=$(git describe | sed 's/^[A-Za-z]*+//;s/-g.*$//;s/\-rc\([^-]*\)-/-rc\1./;s/-/./;s/-.*$//')
 if ! test -f build/gtk2_ardour/ardour-${BINVERSION}.exe; then
 	echo "*** Please compile ardour ${ARDOURVERSION} first."
 	exit 1
diff --git a/wscript b/wscript
index 9ffeebd75e..c30e3f8457 100644
--- a/wscript
+++ b/wscript
@@ -128,7 +128,7 @@ clang_darwin_dict['full-optimization'] = [ '-O3', '-ffast-math', '-fstrength-red
 compiler_flags_dictionaries['clang-darwin'] = clang_darwin_dict;
 
 def fetch_git_revision ():
-    cmd = "git describe HEAD"
+    cmd = "git describe HEAD | sed 's/^[A-Za-z]*+//'"
     output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
     rev = output[0].decode ('utf-8')
     return rev
-- 
cgit v1.2.3