From: Robin Gareus <robin@gareus.org>
Date: Fri, 3 Apr 2015 19:17:04 +0000 (+0200)
Subject: win packaging: use common “define_versions.sh”
X-Git-Tag: 4.0-rc3~60
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=8d80d10d6e9b73765f79679d493e1c8f27499a34;p=ardour.git

win packaging: use common “define_versions.sh”
---

diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh
index ee1aeea319..f18af6d9fb 100755
--- a/tools/x-win/package.sh
+++ b/tools/x-win/package.sh
@@ -76,11 +76,10 @@ test -f ${SRCDIR}/$1 || curl -k -L -o ${SRCDIR}/$1 $2
 ################################################################################
 set -e
 
-ARDOURVERSION=$(git describe | sed 's/^[A-Za-z]*+//;s/-g.*$//')
+ARDOURVERSION=${release_version}
 ARDOURDATE=$(date -R)
-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."
+if ! test -f build/gtk2_ardour/ardour-${ARDOURVERSION}.exe; then
+	echo "*** Please compile  ardour-${ARDOURVERSION}.exe first."
 	exit 1
 fi