From e8106bb41554d596366d9019a2988cc79b71b857 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sun, 13 Jul 2014 08:36:11 -0400
Subject: [PATCH] minor fixes to wscript files to make things python3
 compatible

---
 gtk2_ardour/wscript | 12 ++++--------
 headless/wscript    |  6 +++---
 wscript             |  8 ++++----
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 41e67e023e..95d359f982 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -375,7 +375,7 @@ def build(bld):
                              'libgtkmm2ext',
                              '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.linkflags = ['-mwindows', '-Wl,--export-dynamic']
         obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX']
@@ -392,7 +392,7 @@ def build(bld):
         # just the normal executable version of the GTK GUI
         obj = bld (features = 'cxx c cxxprogram')
         obj.source    = gtk2_ardour_sources
-        obj.target = 'ardour-' + bld.env['VERSION']
+        obj.target = 'ardour-' + str (bld.env['VERSION'])
         obj.includes = ['.']
         obj.ldflags = ['-no-undefined']
 
@@ -415,7 +415,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') + '"',
@@ -474,10 +474,6 @@ def build(bld):
 
     # Wrappers
 
-        print 'DLL = ' + bld.env['DLLDIR'], '\n'
-        print 'DATADIR = ' + bld.env['DATADIR'], '\n'
-        print 'CONF = ' + bld.env['CONFDIR'], '\n'
-
     wrapper_subst_dict = {
             'INSTALL_PREFIX' : bld.env['PREFIX'],
             'LIBDIR'         : os.path.normpath(bld.env['DLLDIR']),
@@ -485,7 +481,7 @@ def build(bld):
             'CONFDIR'        : os.path.normpath(bld.env['CONFDIR']),
             'LIBS'           : 'build/libs',
             '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):
diff --git a/headless/wscript b/headless/wscript
index 3548324fb1..3589ffcf7f 100644
--- a/headless/wscript
+++ b/headless/wscript
@@ -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):
diff --git a/wscript b/wscript
index e772b6ab2a..c08e1b73c7 100644
--- a/wscript
+++ b/wscript
@@ -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()
@@ -736,9 +736,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)