summaryrefslogtreecommitdiff
path: root/tools/define_versions.sh
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-06-11 11:37:52 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-06-11 11:37:52 -0400
commit2e1e5da78e1a18cc2b26bf57bf69a260eaf1e163 (patch)
treeb4002d665ef957f286ae60bd96137e05e5d85cab /tools/define_versions.sh
parentef6366a7cd56157c6468a6c0d87a3e37f6d7c7af (diff)
more changes to consolidate version definition into the top level wscript file
Diffstat (limited to 'tools/define_versions.sh')
-rw-r--r--tools/define_versions.sh6
1 files changed, 2 insertions, 4 deletions
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