allow build/packaging scripts to find the right version ID for as long as we have separate designations on different platforms

git-svn-id: svn://localhost/ardour2/branches/3.0@14132 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2013-03-04 15:49:36 +00:00
parent 90300e0155
commit f9d908e3a9
4 changed files with 9 additions and 3 deletions

View File

@ -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`"

View File

@ -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}"

View File

@ -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"

View File

@ -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'