From 155388ec3c9df48487bb30dde8fea4d05b5e1b7e Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 11 Jun 2013 11:41:49 -0400 Subject: [PATCH] fix up detection of version by define_versions.sh --- tools/define_versions.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/define_versions.sh b/tools/define_versions.sh index 860414e0a6..6f5c17773c 100644 --- a/tools/define_versions.sh +++ b/tools/define_versions.sh @@ -2,8 +2,10 @@ # this is sourced by build and package, and executed from within build/{osx,linux}_packaging # -release_version=`grep -m 1 '^VERSION = ' ../../wscript | awk '{print $3}' | sed "s/'//g"` -r=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed -e 1d -e "s/$release_version-//"` +major_version=`grep -m 1 '^MAJOR = ' ../../wscript | awk '{print $3}' | sed "s/'//g"` +minor_version=`grep -m 1 '^MINOR = ' ../../wscript | awk '{print $3}' | sed "s/'//g"` +release_version=${major_version}.${minor_version} +r=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed -e 1d -e "s/[0-9][0-9]*\.[0-9][0-9]*-//"` if echo $r | grep -q -e - ; then revcount=`echo $r | cut -d- -f1` fi