allow build/packaging scripts to find the right version ID for as long as we have...

git-svn-id: svn://localhost/ardour2/branches/3.0@14132 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index fa894487f3fe4c9351ce927f0e319eaff9ac43a0..2ad0ba678263fa22a5301234ccd8507024ed9181 100755 (executable)
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -87,7 +87,7 @@ if test x$STRIP != xall -a x$STRIP != xnone -a x$STRIP != xsome ; then
     exit 1
 fi
 
-release_version=`grep -m 1 '^VERSION' ../../wscript | awk '{print $3}' | sed "s/'//g"`
+release_version=`grep -m 1 '[^A-Za-z_]LINUX_VERSION = ' ../../wscript | awk '{ print $3' | sed "s/'//g"`
 svn_version=`grep -m 1 'svn_revision =' ../../libs/ardour/svn_revision.cc | cut -d'"' -f 2`
 echo "Version is $release_version / $svn_version"
 info_string="$release_version/$svn_version built on `hostname` by `whoami` on `date`"

diff --git a/tools/linux_packaging/package b/tools/linux_packaging/package
index 7916199f3f39155cf79aff77b79a17499834e888..9abe586868fe8ff84eb0698d3b2a794d6b0c701d 100755 (executable)
--- a/tools/linux_packaging/package
+++ b/tools/linux_packaging/package
@@ -62,7 +62,7 @@ if [ x$DEBUG = xT ]; then
        BUILDTYPE="dbg"
 fi
 
-release_version=`grep -m 1 '^VERSION' ../../wscript | awk '{print $3}' | sed "s/'//g"`
+release_version=`grep -m 1 '[^A-Za-z_]LINUX_VERSION = ' ../../wscript | awk '{print $3}' | sed "s/'//g"`
 svn_version=`grep -m 1 'svn_revision =' ../../libs/ardour/svn_revision.cc | cut -d'"' -f 2`
 
 X86_BUNDLE="${APPNAME}_x86-${release_version}_${svn_version}"

diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index 731614f4f8ab43b95a6e5cbe233a396677842153..687e525746fdc4bae832ea602fa1bac0030effea 100755 (executable)
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -62,7 +62,7 @@ while [ $# -gt 0 ] ; do
     esac
 done
 
-#release_version=`grep -m 1 '^VERSION' ../../wscript | cut -d' ' -f 3 | sed "s/'//g"`
+#release_version=`grep -m 1 '[^A-Za-z_]OSX_VERSION = ' ../../wscript | cut -d' ' -f 3 | sed "s/'//g"`
 release_version=3.0
 svn_version=`grep -m 1 'svn_revision =' ../../libs/ardour/svn_revision.cc | cut -d' ' -f 8 | sed 's/[^0-9]//g'`
 echo "Version is $release_version / $svn_version"

diff --git a/wscript b/wscript
index ba625818e0fb192d38fced2132442ae36dbfcc9c..226d71a34e812bb0a4a2f85b6c4ceea76cbab1cc 100644 (file)
--- a/wscript
+++ b/wscript
@@ -7,9 +7,15 @@ import string
 import subprocess
 import sys
 
+#
+# build scripts need to find the right platform specific version
+# 
+
 if sys.platform == 'darwin':
+    OSX_VERSION = '3.0beta6'
     VERSION = '3.0beta6'
 else:
+    LINUX_VERSION = '3.0rc3'
     VERSION = '3.0rc3'
 
 APPNAME = 'Ardour3'