From 2e1e5da78e1a18cc2b26bf57bf69a260eaf1e163 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 11 Jun 2013 11:37:52 -0400 Subject: more changes to consolidate version definition into the top level wscript file --- tools/define_versions.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tools/define_versions.sh') diff --git a/tools/define_versions.sh b/tools/define_versions.sh index 6f5c17773c..860414e0a6 100644 --- a/tools/define_versions.sh +++ b/tools/define_versions.sh @@ -2,10 +2,8 @@ # this is sourced by build and package, and executed from within build/{osx,linux}_packaging # -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]*-//"` +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-//"` if echo $r | grep -q -e - ; then revcount=`echo $r | cut -d- -f1` fi -- cgit v1.2.3