From 8d80d10d6e9b73765f79679d493e1c8f27499a34 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 3 Apr 2015 21:17:04 +0200 Subject: win packaging: use common “define_versions.sh” MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/x-win/package.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'tools/x-win') 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 -- cgit v1.2.3