smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-01 19:37:45 +01:00
Code Issues Projects Releases Wiki Activity

minor fixes to wscript files to make things python3 compatible

Browse source 
Conflicts:
	gtk2_ardour/wscript
This commit is contained in:
Paul Davis 2014-07-13 08:36:11 -04:00
parent e299d114b4
commit e00ceba896
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/wscript
View file

@ -445,7 +445,7 @@ def build(bld):
obj.defines = [
'PACKAGE="' + I18N_PACKAGE + '"',
'VERSIONSTRING="' + bld.env['VERSION'] + '"',
'VERSIONSTRING="' + str (bld.env['VERSION']) + '"',
'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',

6
headless/wscript
View file

@ -38,7 +38,7 @@ def build(bld):
# this program does not do the whole hidden symbols thing
obj.cxxflags = [ '-fvisibility=default' ]
obj.source = hardour_sources
obj.target = 'hardour-' + bld.env['VERSION']
obj.target = 'hardour-' + str (bld.env['VERSION'])
obj.includes = ['.']
# at this point, "obj" refers to either the normal native executable
@ -52,7 +52,7 @@ def build(bld):
]
obj.defines = [
'VERSIONSTRING="' + bld.env['VERSION'] + '"',
'VERSIONSTRING="' + str(bld.env['VERSION']) + '"',
'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
@ -84,7 +84,7 @@ def build(bld):
'CONFDIR' : os.path.normpath(bld.env['CONFDIR']),
'LIBS' : 'build/libs',
'VERSION' : bld.env['VERSION'],
'EXECUTABLE' : 'build/headless/hardour-' + bld.env['VERSION']
'EXECUTABLE' : 'build/headless/hardour-' + str(bld.env['VERSION'])
}
def set_subst_dict(obj, dict):

8
wscript
View file

@ -16,7 +16,7 @@ def fetch_git_revision ():
def fetch_tarball_revision ():
if not os.path.exists ('libs/ardour/revision.cc'):
print 'This tarball was not created correctly - it is missing libs/ardour/revision.cc'
print ('This tarball was not created correctly - it is missing libs/ardour/revision.cc')
sys.exit (1)
with open('libs/ardour/revision.cc') as f:
content = f.readlines()
@ -742,9 +742,9 @@ def configure(conf):
conf.env['LXVST_SUPPORT'] = False
elif Options.options.dist_target == 'mingw':
conf.env['LXVST_SUPPORT'] = False
else:
conf.define('LXVST_SUPPORT', 1)
conf.env['LXVST_SUPPORT'] = True
else:
conf.define('LXVST_SUPPORT', 1)
conf.env['LXVST_SUPPORT'] = True
conf.env['WINDOWS_KEY'] = opts.windows_key
if opts.rt_alloc_debug:
conf.define('DEBUG_RT_ALLOC', 1)