smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 11:46:25 +01:00
Code Issues Projects Releases Wiki Activity

adjust the way version and revision info are gathered, defined and used

Browse source
This commit is contained in:
Paul Davis 2013-06-11 10:58:24 -04:00
parent 61e302c6bb
commit ef6366a7cd
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gtk2_ardour/wscript
View file

@ -10,13 +10,10 @@ from waflib.Task import Task
# Version of this package (even if built as a child) # Version of this package (even if built as a child)
MAJOR = '3' MAJOR = '3'
MINOR = '0' MINOR = '2'
MICRO = '0'
GTK2_ARDOUR_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO)
# Variables for 'waf dist' # Variables for 'waf dist'
APPNAME = 'gtk2_ardour3' VERSION = "%s.%s" % (MAJOR, MINOR)
VERSION = GTK2_ARDOUR_VERSION
I18N_PACKAGE = 'gtk2_ardour3' I18N_PACKAGE = 'gtk2_ardour3'
# Mandatory variables # Mandatory variables
@ -265,10 +262,11 @@ def options(opt):
def configure(conf): def configure(conf):
conf.load('misc') conf.load('misc')
conf.load('compiler_cxx') conf.load('compiler_cxx')
# we don't use hard-coded micro versions with ardour, so hard code it to zero
autowaf.build_version_files( autowaf.build_version_files(
path_prefix + 'version.h', path_prefix + 'version.h',
path_prefix + 'version.cc', path_prefix + 'version.cc',
'gtk2_ardour', MAJOR, MINOR, MICRO) 'gtk2_ardour', MAJOR, MINOR, 0)
autowaf.configure(conf) autowaf.configure(conf)
if re.search ("linux", sys.platform) != None: if re.search ("linux", sys.platform) != None:

6
tools/define_versions.sh
View file

@ -2,8 +2,10 @@
# this is sourced by build and package, and executed from within build/{osx,linux}_packaging # 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"` major_version=`grep -m 1 '^MAJOR = ' ../../wscript | awk '{print $3}' | sed "s/'//g"`
r=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed -e 1d -e "s/$release_version-//"` 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 if echo $r | grep -q -e - ; then
revcount=`echo $r | cut -d- -f1` revcount=`echo $r | cut -d- -f1`
fi fi