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

fix visible version number to use the one defined in the top level wscript

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7127 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-05-20 15:34:23 +00:00
parent d443688c92
commit e58f6752af
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gtk2_ardour/wscript
View file

@ -8,9 +8,9 @@ import TaskGen
import re import re
# Version of this package (even if built as a child) # Version of this package (even if built as a child)
MAJOR = '1' MAJOR = '3'
MINOR = '0' MINOR = '0'
MICRO = '2' MICRO = '0'
GTK2_ARDOUR_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO) GTK2_ARDOUR_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO)
# Variables for 'waf dist' # Variables for 'waf dist'
@ -250,7 +250,7 @@ def build(bld):
libgtkmm2ext libtaglib''' libgtkmm2ext libtaglib'''
obj.cflags = ['-DPACKAGE="gtk2_ardour"'] obj.cflags = ['-DPACKAGE="gtk2_ardour"']
obj.cxxflags = ['-DPACKAGE="gtk2_ardour"'] obj.cxxflags = ['-DPACKAGE="gtk2_ardour"']
obj.cxxflags += ['-DVERSIONSTRING="' + GTK2_ARDOUR_VERSION + '"'] obj.cxxflags += ['-DVERSIONSTRING="' + bld.env['VERSION'] + '"']
obj.cxxflags += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"'] obj.cxxflags += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"']
obj.cxxflags += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"'] obj.cxxflags += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"']
obj.cxxflags += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"'] obj.cxxflags += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"']

1
wscript
View file

@ -372,6 +372,7 @@ def sub_config_and_use(conf, name, has_objects = True):
def configure(conf): def configure(conf):
create_stored_revision() create_stored_revision()
conf.env['VERSION'] = VERSION
autowaf.set_recursive() autowaf.set_recursive()
autowaf.configure(conf) autowaf.configure(conf)