ardour/livetrax
13
0
Fork 0
Code

minor fixes to wscript files to make things python3 compatible

Browse Source
This commit is contained in:
Paul Davis 2014-07-13 08:36:11 -04:00
parent b51e3e0e6c
commit e8106bb415
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk2_ardour/wscript
View File

@ -375,7 +375,7 @@ def build(bld):
'libgtkmm2ext', 'libgtkmm2ext',
'libcanvas' 'libcanvas'
] ]
obj.target = 'ardour-' + bld.env['VERSION'] + '-vst.exe.so' obj.target = 'ardour-' + str (bld.env['VERSION']) + '-vst.exe.so'
obj.includes = [ '../libs/fst', '.' ] obj.includes = [ '../libs/fst', '.' ]
obj.linkflags = ['-mwindows', '-Wl,--export-dynamic'] obj.linkflags = ['-mwindows', '-Wl,--export-dynamic']
obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX'] obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX']
@ -392,7 +392,7 @@ def build(bld):
# just the normal executable version of the GTK GUI # just the normal executable version of the GTK GUI
obj = bld (features = 'cxx c cxxprogram') obj = bld (features = 'cxx c cxxprogram')
obj.source = gtk2_ardour_sources obj.source = gtk2_ardour_sources
obj.target = 'ardour-' + bld.env['VERSION'] obj.target = 'ardour-' + str (bld.env['VERSION'])
obj.includes = ['.'] obj.includes = ['.']
obj.ldflags = ['-no-undefined'] obj.ldflags = ['-no-undefined']
@ -415,7 +415,7 @@ def build(bld):
obj.defines = [ obj.defines = [
'PACKAGE="' + I18N_PACKAGE + '"', 'PACKAGE="' + I18N_PACKAGE + '"',
'VERSIONSTRING="' + bld.env['VERSION'] + '"', 'VERSIONSTRING="' + str (bld.env['VERSION']) + '"',
'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"', 'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
@ -474,10 +474,6 @@ def build(bld):
# Wrappers # Wrappers
print 'DLL = ' + bld.env['DLLDIR'], '\n'
print 'DATADIR = ' + bld.env['DATADIR'], '\n'
print 'CONF = ' + bld.env['CONFDIR'], '\n'
wrapper_subst_dict = { wrapper_subst_dict = {
'INSTALL_PREFIX' : bld.env['PREFIX'], 'INSTALL_PREFIX' : bld.env['PREFIX'],
'LIBDIR' : os.path.normpath(bld.env['DLLDIR']), 'LIBDIR' : os.path.normpath(bld.env['DLLDIR']),
@ -485,7 +481,7 @@ def build(bld):
'CONFDIR' : os.path.normpath(bld.env['CONFDIR']), 'CONFDIR' : os.path.normpath(bld.env['CONFDIR']),
'LIBS' : 'build/libs', 'LIBS' : 'build/libs',
'VERSION' : bld.env['VERSION'], 'VERSION' : bld.env['VERSION'],
'EXECUTABLE' : 'build/gtk2_ardour/ardour-' + bld.env['VERSION'] 'EXECUTABLE' : 'build/gtk2_ardour/ardour-' + str (bld.env['VERSION'])
} }
def set_subst_dict(obj, dict): def set_subst_dict(obj, dict):

6
headless/wscript
View File

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

2
wscript
View File

@ -16,7 +16,7 @@ def fetch_git_revision ():
def fetch_tarball_revision (): def fetch_tarball_revision ():
if not os.path.exists ('libs/ardour/revision.cc'): 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) sys.exit (1)
with open('libs/ardour/revision.cc') as f: with open('libs/ardour/revision.cc') as f:
content = f.readlines() content = f.readlines()