Changes in wscript [5e1c04f:ff75d60]

File:

• wscript (modified) (6 diffs)

wscript

@@ -34 +34 @@
   ctx.add_option('--enable-double', action='store_true', default=False,
       help='compile aubio in double precision mode')
-  ctx.add_option('--enable-fftw', action='store_true', default=False,
-      help='compile with ooura instead of fftw')
   ctx.add_option('--enable-fftw3f', action='store_true', default=False,
-      help='compile with fftw3 instead of fftw3f')
+      help='compile with fftw3f instead of ooura (recommended)')
+  ctx.add_option('--enable-fftw3', action='store_true', default=False,
+      help='compile with fftw3 instead of ooura (recommended in double precision)')
   ctx.add_option('--enable-complex', action='store_true', default=False,
       help='compile with C99 complex')
-  ctx.add_option('--enable-jack', action='store_true', default=False,
+  ctx.add_option('--enable-jack', action='store_true', default=None,
       help='compile with jack support')
-  ctx.add_option('--enable-lash', action='store_true', default=False,
+  ctx.add_option('--enable-lash', action='store_true', default=None,
       help='compile with lash support')
-  ctx.add_option('--enable-sndfile', action='store_true', default=False,
+  ctx.add_option('--enable-sndfile', action='store_true', default=None,
       help='compile with libsndfile support')
-  ctx.add_option('--enable-samplerate', action='store_true', default=False,
+  ctx.add_option('--enable-samplerate', action='store_true', default=None,
       help='compile with libsamplerate support')
-  ctx.add_option('--enable-swig', action='store_true', default=False,
-      help='compile with swig support (obsolete)')
   ctx.add_option('--with-target-platform', type='string',
       help='set target platform for cross-compilation', dest='target_platform')
@@ -72 +70 @@
     ctx.env.CC = 'llvm-gcc-4.2'
     ctx.env.LINK_CC = 'llvm-gcc-4.2'
-    ctx.env.FRAMEWORK = ['CoreFoundation', 'AudioToolbox']
+    ctx.env.FRAMEWORK = ['CoreFoundation', 'AudioToolbox', 'Accelerate']
+    ctx.define('HAVE_ACCELERATE', 1)
 
   if Options.platform == 'ios':
@@ -78 +77 @@
     ctx.env.LD = 'clang'
     ctx.env.LINK_CC = 'clang'
-    ctx.define('TARGET_OS_IPHONE', 1)
-    SDKVER="6.1"
+    SDKVER="7.0"
     DEVROOT="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer"
     SDKROOT="%(DEVROOT)s/SDKs/iPhoneOS%(SDKVER)s.sdk" % locals()
-    ctx.env.FRAMEWORK = ['CoreFoundation', 'AudioToolbox']
-    ctx.env.CFLAGS += [ '-miphoneos-version-min=6.1', '-arch', 'armv7', '-arch', 'armv7s',
+    ctx.env.FRAMEWORK = ['CoreFoundation', 'AudioToolbox', 'Accelerate']
+    ctx.define('HAVE_ACCELERATE', 1)
+    ctx.env.CFLAGS += [ '-miphoneos-version-min=6.1', '-arch', 'armv7',
             '--sysroot=%s' % SDKROOT]
-    ctx.env.LINKFLAGS += ['-std=c99', '-arch', 'armv7', '-arch', 'armv7s', '--sysroot=%s' %
+    ctx.env.LINKFLAGS += ['-std=c99', '-arch', 'armv7', '--sysroot=%s' %
             SDKROOT]
 
@@ -94 +93 @@
   ctx.check(header_name='string.h')
   ctx.check(header_name='limits.h')
-
-  # optionally use complex.h
-  if (Options.options.enable_complex == True):
-    ctx.check(header_name='complex.h')
-
-  # check dependencies
-  if (Options.options.enable_sndfile == True):
-    ctx.check_cfg(package = 'sndfile', atleast_version = '1.0.4',
-      args = '--cflags --libs')
-  if (Options.options.enable_samplerate == True):
-      ctx.check_cfg(package = 'samplerate', atleast_version = '0.0.15',
-        args = '--cflags --libs')
-
-  # double precision mode
-  if (Options.options.enable_double == True):
-    ctx.define('HAVE_AUBIO_DOUBLE', 1)
-  else:
-    ctx.define('HAVE_AUBIO_DOUBLE', 0)
-
-  # check if pkg-config is installed, optional
-  try:
-    ctx.find_program('pkg-config', var='PKGCONFIG')
-  except ctx.errors.ConfigurationError:
-    ctx.msg('Could not find pkg-config', 'disabling fftw, jack, and lash')
-    ctx.msg('Could not find fftw', 'using ooura')
-
-  # optional dependancies using pkg-config
-  if ctx.env['PKGCONFIG']:
-
-    if (Options.options.enable_fftw == True or Options.options.enable_fftw3f == True):
-      # one of fftwf or fftw3f
-      if (Options.options.enable_fftw3f == True):
-        ctx.check_cfg(package = 'fftw3f', atleast_version = '3.0.0',
-            args = '--cflags --libs')
-        if (Options.options.enable_double == True):
-          ctx.msg('Warning', 'fftw3f enabled, but aubio compiled in double precision!')
-      else:
-        # fftw3f not enabled, take most sensible one according to enable_double
-        if (Options.options.enable_double == True):
-          ctx.check_cfg(package = 'fftw3', atleast_version = '3.0.0',
-              args = '--cflags --libs')
-        else:
-          ctx.check_cfg(package = 'fftw3f', atleast_version = '3.0.0',
-              args = '--cflags --libs')
-      ctx.define('HAVE_FFTW3', 1)
-    else:
-      # fftw disabled, use ooura
-      ctx.msg('Checking for FFT implementation', 'ooura')
-      pass
-
-    if (Options.options.enable_jack == True):
-      ctx.check_cfg(package = 'jack', atleast_version = '0.15.0',
-      args = '--cflags --libs')
-
-    if (Options.options.enable_lash == True):
-      ctx.check_cfg(package = 'lash-1.0', atleast_version = '0.5.0',
-      args = '--cflags --libs', uselib_store = 'LASH')
-
-  # swig
-  if (Options.options.enable_swig == True):
-    try:
-      ctx.find_program('swig', var='SWIG')
-    except ctx.errors.ConfigurationError:
-      ctx.to_log('swig was not found, not looking for (ignoring)')
-
-    if ctx.env['SWIG']:
-      ctx.check_tool('swig')
-      ctx.check_swig_version()
-
-      # python
-      if ctx.find_program('python'):
-        ctx.check_tool('python')
-        ctx.check_python_version((2,4,2))
-        ctx.check_python_headers()
 
   # check support for C99 __VA_ARGS__ macros
@@ -179 +104 @@
     ctx.define('HAVE_C99_VARARGS_MACROS', 1)
 
+  # optionally use complex.h
+  if (Options.options.enable_complex == True):
+    ctx.check(header_name='complex.h')
+
+  # check dependencies
+  if (Options.options.enable_sndfile != False):
+      ctx.check_cfg(package = 'sndfile', atleast_version = '1.0.4',
+        args = '--cflags --libs', mandatory = False)
+  if (Options.options.enable_samplerate != False):
+      ctx.check_cfg(package = 'samplerate', atleast_version = '0.0.15',
+        args = '--cflags --libs', mandatory = False)
+
+  # double precision mode
+  if (Options.options.enable_double == True):
+    ctx.define('HAVE_AUBIO_DOUBLE', 1)
+  else:
+    ctx.define('HAVE_AUBIO_DOUBLE', 0)
+
+  # optional dependancies using pkg-config
+  if (Options.options.enable_fftw3 != False or Options.options.enable_fftw3f != False):
+    # one of fftwf or fftw3f
+    if (Options.options.enable_fftw3f != False):
+      ctx.check_cfg(package = 'fftw3f', atleast_version = '3.0.0',
+          args = '--cflags --libs', mandatory = False)
+      if (Options.options.enable_double == True):
+        ctx.msg('Warning', 'fftw3f enabled, but aubio compiled in double precision!')
+    else:
+      # fftw3f not enabled, take most sensible one according to enable_double
+      if (Options.options.enable_double == True):
+        ctx.check_cfg(package = 'fftw3', atleast_version = '3.0.0',
+            args = '--cflags --libs', mandatory = False)
+      else:
+        ctx.check_cfg(package = 'fftw3f', atleast_version = '3.0.0',
+            args = '--cflags --libs', mandatory = False)
+    ctx.define('HAVE_FFTW3', 1)
+
+  # fftw disabled, use ooura
+  if 'HAVE_FFTW3F' in ctx.env.define_key:
+    ctx.msg('Checking for FFT implementation', 'fftw3f')
+  elif 'HAVE_FFTW3' in ctx.env.define_key:
+    ctx.msg('Checking for FFT implementation', 'fftw3')
+  elif 'HAVE_ACCELERATE' in ctx.env.define_key:
+    ctx.msg('Checking for FFT implementation', 'vDSP')
+  else:
+    ctx.msg('Checking for FFT implementation', 'ooura')
+
+  if (Options.options.enable_jack != False):
+    ctx.check_cfg(package = 'jack', atleast_version = '0.15.0',
+    args = '--cflags --libs', mandatory = False)
+
+  if (Options.options.enable_lash != False):
+    ctx.check_cfg(package = 'lash-1.0', atleast_version = '0.5.0',
+    args = '--cflags --libs', uselib_store = 'LASH', mandatory = False)
+
   # write configuration header
   ctx.write_config_header('src/config.h')
@@ -204 +183 @@
 
   """
-  # create the aubio.pc file for pkg-config
-  if ctx.env['TARGET_PLATFORM'] == 'linux':
-    aubiopc = ctx.new_task_gen('subst')
-    aubiopc.source = 'aubio.pc.in'
-    aubiopc.target = 'aubio.pc'
-    aubiopc.install_path = '${PREFIX}/lib/pkgconfig'
-
-  # build manpages from sgml files
-  if ctx.env['DOCBOOKTOMAN']:
-    import TaskGen
-    TaskGen.declare_chain(
-        name    = 'docbooktoman',
-        rule    = '${DOCBOOKTOMAN} ${SRC} > ${TGT}',
-        ext_in  = '.sgml',
-        ext_out = '.1',
-        reentrant = 0,
-    )
-    manpages = ctx.new_task_gen(name = 'docbooktoman',
-        source=ctx.path.ant_glob('doc/*.sgml'))
-    ctx.install_files('${MANDIR}/man1', ctx.path.ant_glob('doc/*.1'))
-
   # install woodblock sound
   bld.install_files('${PREFIX}/share/sounds/aubio/',
       'sounds/woodblock.aiff')
   """
+
+  bld( source = 'aubio.pc.in' )
+
+  # build manpages from sgml files
+  if bld.env['DOCBOOKTOMAN']:
+    from waflib import TaskGen
+    if 'MANDIR' not in bld.env:
+      bld.env['MANDIR'] = bld.env['PREFIX'] + '/share/man'
+    TaskGen.declare_chain(
+        name      = 'docbooktoman',
+        rule      = '${DOCBOOKTOMAN} ${SRC} > ${TGT}',
+        ext_in    = '.sgml',
+        ext_out   = '.1',
+        reentrant = False,
+        install_path =  '${MANDIR}/man1',
+    )
+    bld( source = bld.path.ant_glob('doc/*.sgml') )
+
+  """
+  bld(rule = 'doxygen ${SRC}', source = 'web.cfg') #, target = 'doc/web/index.html')
+  """
+
 
 def shutdown(bld):