win packaging: use common “define_versions.sh”
authorRobin Gareus <robin@gareus.org>
Fri, 3 Apr 2015 19:17:04 +0000 (21:17 +0200)
committerRobin Gareus <robin@gareus.org>
Fri, 3 Apr 2015 19:17:04 +0000 (21:17 +0200)
tools/x-win/package.sh

index ee1aeea319c50fdddf2a6c1af6c335b65fe9b9d7..f18af6d9fb62a17469a2cb342351aba869704347 100755 (executable)
@@ -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