interfaces/python/py-cvec.c: write setters for norm and phas

[aubio.git] / wscript

diff --git a/wscript b/wscript
index b3eea20af01480389c2263717b7d41639e03d675..eb09721004ed496b38089deb5657382b8f69d544 100644 (file)
--- a/wscript
+++ b/wscript
@@ -33,9 +33,7 @@ def set_options(opt):
   opt.tool_options('compiler_cc')
   opt.tool_options('compiler_cxx')
   opt.tool_options('gnu_dirs')
-  # include locally patched version of UnitTest until upstream incorporates patch
-  # see http://code.google.com/p/waf/issues/detail?id=542
-  opt.tool_options('UnitTest', tooldir='.')
+  opt.tool_options('UnitTest')
 
 def configure(conf):
   import Options
@@ -55,6 +53,7 @@ def configure(conf):
   conf.check(header_name='stdio.h')
   conf.check(header_name='math.h')
   conf.check(header_name='string.h')
+  conf.check(header_name='limits.h')
 
   # optionally use complex.h
   if (Options.options.disable_complex == False):
@@ -137,7 +136,7 @@ def build(bld):
   bld.env['LIB_VERSION'] = LIB_VERSION 
 
   # add sub directories
-  bld.add_subdirs('src ext examples cpp')
+  bld.add_subdirs('src examples interfaces/cpp')
   if bld.env['SWIG']:
     if bld.env['PYTHON']:
       bld.add_subdirs('python/aubio python')
@@ -184,13 +183,15 @@ def shutdown(bld):
 def build_tests(bld):
   for target_name in bld.path.ant_glob('tests/src/**/*.c').split():
     this_target = bld.new_task_gen(
-        features = 'cprogram cc test',
+        features = 'cc cprogram test',
         source = target_name,
         target = target_name.split('.')[0],
         includes = 'src',
-        install_path = None,
+        defines = 'AUBIO_UNSTABLE_API=1',
         uselib_local = 'aubio')
-    # phasevoc-jack also needs aubioext
+    # phasevoc-jack also needs jack 
     if target_name.endswith('test-phasevoc-jack.c'):
-      this_target.includes = ['src', 'ext']
-      this_target.uselib_local = ['aubio', 'aubioext']
+      this_target.includes = ['src', 'examples']
+      this_target.uselib_local = ['aubio']
+      this_target.uselib = ['JACK']
+      this_target.source += ' examples/jackio.c'