summaryrefslogtreecommitdiff
path: root/tools/x-win
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2015-04-02 23:42:16 +0200
committerRobin Gareus <robin@gareus.org>2015-04-02 23:42:28 +0200
commita842a69c16f9d2ce8e41c77b727b8252e4d7a5fe (patch)
tree80f51252b579ebf4a2ba277f41f3148eebfb3149 /tools/x-win
parenteba21335b952f99b6444d50cb2b4118af646bedd (diff)
allow to prefix tags with “<text>+”
eg. mixbus+3.0 or mb+3.1-rc1
Diffstat (limited to 'tools/x-win')
-rwxr-xr-xtools/x-win/package.sh4
1 files changed, 2 insertions, 2 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