Don't use API definition as namespace & fix whitespace

[ardour.git] / wscript

diff --git a/wscript b/wscript
index 2f4cd10661a9e1514238508a3f13c7849d6d2828..c7e4245024793201c66843b157d0e3975128de8b 100644 (file)
--- a/wscript
+++ b/wscript
@@ -220,6 +220,8 @@ children = [
         'libs/gtkmm2ext',
         'libs/audiographer',
         'libs/canvas',
+        'libs/widgets',
+        'libs/waveview',
         'libs/plugins/reasonablesynth.lv2',
         'libs/plugins/a-comp.lv2',
         'libs/plugins/a-delay.lv2',
@@ -239,7 +241,6 @@ children = [
         'libs/fst',
         'libs/vfork',
         'libs/ardouralsautil',
-        'cfgtool',
         'tools/luadevel',
 ]
 
@@ -287,10 +288,10 @@ def create_stored_revision():
 
 def get_depstack_rev(depstack_root):
     try:
-        with open(depstack_root + '/.vers', 'r') as f:
+        with open(depstack_root + '/../.vers', 'r') as f:
             return f.readline()
     except IOError:
-        return '';
+        return '-unknown-';
 
 def set_compiler_flags (conf,opt):
     #
@@ -545,12 +546,12 @@ int main() { return 0; }''',
                 ("-DMAC_OS_X_VERSION_MIN_REQUIRED=1070",
                  '-mmacosx-version-min=10.7'))
 
-    elif conf.env['build_target'] in [ 'mavericks', 'yosemite', 'el_capitan' ]:
+    elif conf.env['build_target'] in [ 'mavericks', 'yosemite' ]:
         compiler_flags.extend(
                 ("-DMAC_OS_X_VERSION_MAX_ALLOWED=1090",
                  "-mmacosx-version-min=10.8"))
 
-    elif conf.env['build_target'] in [ 'sierra' ]:
+    elif conf.env['build_target'] in ['el_capitan', 'sierra' ]:
         compiler_flags.extend(
                 ("-DMAC_OS_X_VERSION_MAX_ALLOWED=1090",
                  "-mmacosx-version-min=10.9"))
@@ -729,6 +730,8 @@ def options(opt):
                     help='Compile Tool to dump LuaBindings (needs C++11)')
     opt.add_option('--canvasui', action='store_true', default=False, dest='canvasui',
                     help='Compile libcanvas test GUI')
+    opt.add_option('--beatbox', action='store_true', default=False, dest='beatbox',
+                    help='Compile beatbox test app')
     opt.add_option('--lv2', action='store_true', default=True, dest='lv2',
                     help='Compile with support for LV2 (if Lilv+Suil is available)')
     opt.add_option('--no-lv2', action='store_false', dest='lv2',
@@ -859,7 +862,7 @@ def configure(conf):
         conf.env.append_value('CXXFLAGS',  [prefinclude ])
         conf.env.append_value('LINKFLAGS', [ preflib ])
         autowaf.display_msg(conf, 'Will build against private GTK dependency stack in ' + user_gtk_root, 'yes')
-        conf.env['DEPSTACK_REV'] = get_depstack_rev (user_gtk_root)
+        conf.env['DEPSTACK_REV'] = get_depstack_rev (Options.options.depstack_root)
     else:
         autowaf.display_msg(conf, 'Will build against private GTK dependency stack', 'no')
         conf.env['DEPSTACK_REV'] = '-system-'
@@ -958,6 +961,10 @@ def configure(conf):
         conf.env['CANVASTESTUI'] = True
         conf.define ('CANVASTESTUI', 1)
 
+    if Options.options.beatbox:
+        conf.env['BEATBOX'] = True
+        conf.define ('BEATBOX', 1)
+
     if Options.options.luadoc:
         conf.env['LUABINDINGDOC'] = True
         conf.define ('LUABINDINGDOC', 1)
@@ -1238,6 +1245,7 @@ const char* const ardour_config_info = "\\n\\
     write_config_text('AudioUnits',            conf.is_defined('AUDIOUNIT_SUPPORT'))
     write_config_text('Build target',          conf.env['build_target'])
     write_config_text('Canvas Test UI',        conf.is_defined('CANVASTESTUI'))
+    write_config_text('Beatbox test app',      conf.is_defined('BEATBOX'))
     write_config_text('CoreAudio',             conf.is_defined('HAVE_COREAUDIO'))
     write_config_text('CoreAudio 10.5 compat', conf.is_defined('COREAUDIO105'))
     write_config_text('Debug RT allocations',  conf.is_defined('DEBUG_RT_ALLOC'))
@@ -1262,6 +1270,7 @@ const char* const ardour_config_info = "\\n\\
     write_config_text('PT format',             conf.is_defined('PTFORMAT'))
     write_config_text('PTW32 Semaphore',       conf.is_defined('USE_PTW32_SEMAPHORE'))
 #    write_config_text('Soundtouch',            conf.is_defined('HAVE_SOUNDTOUCH'))
+    write_config_text('Threaded WaveViews',    not opts.no_threaded_waveviews)
     write_config_text('Translation',           opts.nls)
 #    write_config_text('Tranzport',             opts.tranzport)
     write_config_text('Unit tests',            conf.env['BUILD_TESTS'])
@@ -1337,8 +1346,13 @@ def build(bld):
     for i in children:
         bld.recurse(i)
 
+    if bld.is_defined ('BEATBOX'):
+        bld.recurse('tools/bb')
+            
     bld.install_files (bld.env['CONFDIR'], 'system_config')
 
+    bld.install_files (os.path.join (bld.env['DATADIR'], 'templates'), bld.path.ant_glob ('templates/**'), cwd=bld.path.find_dir ('templates'), relative_trick=True)
+
     if bld.env['RUN_TESTS']:
         bld.add_post_fun(test)