Changeset 46378b3


Ignore:
Timestamp:
Sep 26, 2011, 8:21:00 AM (9 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, master, pitchshift, sampler, timestretch, yinfft+
Children:
2a6e672
Parents:
20ae690
Message:

wscript: update to waf 1.6.7

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • examples/wscript_build

    r20ae690 r46378b3  
    11# build examples
     2sndfileio = bld.new_task_gen(features = 'c',
     3    includes = '../src',
     4    source = ['sndfileio.c'],
     5    target = 'sndfileio')
     6
     7utilsio = bld.new_task_gen(features = 'c',
     8      includes = '../src',
     9      add_objects = 'sndfileio',
     10      source = ['utils.c', 'jackio.c'],
     11      uselib = ['LASH', 'JACK', 'SNDFILE'],
     12      target = 'utilsio')
    213
    314# loop over all *.c filenames in examples to build them all
    4 for target_name in bld.path.ant_glob('*.c').split():
    5   # ignore utils.c
    6   if target_name in ['utils.c', 'jackio.c', 'sndfileio.c']: continue
    7   bld.new_task_gen(features = 'cc cprogram',
     15for target_name in bld.path.ant_glob('*.c', excl = ['utils.c', 'jackio.c', 'sndfileio.c']):
     16  bld.new_task_gen(features = 'c cprogram',
    817      add_objects = 'utilsio',
    918      includes = '../src',
    1019      uselib = ['LASH', 'JACK', 'SNDFILE'],
    11       uselib_local = ['aubio'],
     20      use = ['aubio'],
    1221      source = target_name,
    1322      # program name is filename.c without the .c
    14       target = target_name.split('.')[0])
     23      target = str(target_name).split('.')[0])
  • python/aubio/wscript_build

    r20ae690 r46378b3  
    44  add_objects = 'sndfileio',
    55  target = '_aubiowrapper',
    6   uselib_local = ['aubio'],
     6  use = ['aubio'],
    77  uselib = ['SNDFILE'],
    88  swig_flags = '-python -Wall',
  • src/wscript_build

    r20ae690 r46378b3  
    11# build libaubio
    22libaubio = bld.new_task_gen(
    3     features = 'cc cshlib',
     3    features = 'c cshlib',
    44    includes = ['.'],
    55    source = bld.path.ant_glob('*.c **/*.c'),
     
    99
    1010# install headers, except _priv.h ones
    11 for file in bld.path.ant_glob('**/*.h').split():
    12   if '_priv.h' in file or file == 'config.h': continue
    13   bld.install_as('${PREFIX}/include/aubio/' + file, file)
     11bld.install_files('${PREFIX}/include/aubio/',
     12        bld.path.ant_glob('**/*.h',
     13        exclude = ['_priv.h', 'config.h']),
     14        relative_trick=True)
  • wscript

    r20ae690 r46378b3  
    1515VERSION = '0.3.3'
    1616LIB_VERSION = '2.1.1'
    17 srcdir = '.'
    18 blddir = 'build'
     17top = '.'
     18out = 'build'
    1919
    2020def init(opt):
    2121  pass
    2222
    23 def set_options(opt):
     23def options(opt):
    2424  opt.add_option('--enable-double', action='store_true', default=False,
    2525      help='compile aubio in double precision mode')
     
    2828  opt.add_option('--enable-complex', action='store_true', default=False,
    2929      help='compile with C99 complex')
    30   opt.add_option('--disable-jack', action='store_true', default=False,
     30  opt.add_option('--enable-jack', action='store_true', default=False,
    3131      help='compile without jack support')
    32   opt.add_option('--disable-lash', action='store_true', default=False,
     32  opt.add_option('--enable-lash', action='store_true', default=False,
    3333      help='compile without lash support')
    34   opt.add_option('--disable-libsamplerate', action='store_true', default=False,
     34  opt.add_option('--enable-libsamplerate', action='store_true', default=False,
    3535      help='compile without libsamplerate support')
    3636  opt.add_option('--with-target-platform', type='string',
    3737      help='set target platform for cross-compilation', dest='target_platform')
    38   opt.tool_options('compiler_cc')
    39   opt.tool_options('compiler_cxx')
    40   opt.tool_options('gnu_dirs')
    41   opt.tool_options('UnitTest')
     38  opt.load('compiler_cc')
     39  opt.load('compiler_cxx')
     40  opt.load('gnu_dirs')
     41  opt.load('waf_unit_test')
    4242
    4343def configure(conf):
     
    4747  conf.check_tool('gnu_dirs') # helpful for autotools transition and .pc generation
    4848  conf.check_tool('misc') # needed for subst
     49  conf.load('waf_unit_test')
    4950
    5051  if Options.options.target_platform:
     
    6869  conf.check_cfg(package = 'sndfile', atleast_version = '1.0.4',
    6970    args = '--cflags --libs')
    70   if (Options.options.disable_libsamplerate == False):
    71       conf.check_cfg(package = 'libsamplerate', atleast_version = '0.0.15',
     71  if (Options.options.enable_libsamplerate == True):
     72      conf.check_cfg(package = 'samplerate', atleast_version = '0.0.15',
    7273        args = '--cflags --libs')
    7374
     
    9293
    9394  # optional dependancies
    94   if (Options.options.disable_jack == False):
     95  if (Options.options.enable_jack == True):
    9596    conf.check_cfg(package = 'jack', atleast_version = '0.15.0',
    9697    args = '--cflags --libs')
    97   if (Options.options.disable_lash == False):
     98  if (Options.options.enable_lash == True):
    9899    conf.check_cfg(package = 'lash-1.0', atleast_version = '0.5.0',
    99100    args = '--cflags --libs', uselib_store = 'LASH')
    100101
    101102  # swig
    102   if conf.find_program('swig', var='SWIG', mandatory = False):
     103  if 0: #conf.find_program('swig', var='SWIG', mandatory = False):
    103104    conf.check_tool('swig', tooldir='swig')
    104105    conf.check_swig_version('1.3.27')
     
    116117'''
    117118  if conf.check_cc(fragment = check_c99_varargs,
    118       type='cstaticlib',
     119      type='cstlib',
    119120      msg = 'Checking for C99 __VA_ARGS__ macro'):
    120121    conf.define('HAVE_C99_VARARGS_MACROS', 1)
     
    133134  bld.env['VERSION'] = VERSION
    134135  bld.env['LIB_VERSION'] = LIB_VERSION
    135 
    136   build_extras(bld)
    137136
    138137  # add sub directories
     
    168167  # build and run the unit tests
    169168  build_tests(bld)
    170   import UnitTest
    171   bld.add_post_fun(UnitTest.summary)
    172169
    173170def shutdown(bld):
     
    177174# target name is filename.c without the .c
    178175def build_tests(bld):
    179   for target_name in bld.path.ant_glob('tests/src/**/*.c').split():
     176  for target_name in bld.path.ant_glob('tests/src/**/*.c'):
    180177    this_target = bld.new_task_gen(
    181         features = 'cc cprogram test',
     178        features = 'c cprogram test',
    182179        source = target_name,
    183         target = target_name.split('.')[0],
     180        target = str(target_name).split('.')[0],
    184181        includes = 'src',
    185182        defines = 'AUBIO_UNSTABLE_API=1',
    186         uselib_local = 'aubio')
     183        use = 'aubio')
    187184    # phasevoc-jack also needs jack
    188     if target_name.endswith('test-phasevoc-jack.c'):
     185    if str(target_name).endswith('test-phasevoc-jack.c'):
    189186      this_target.includes = ['src', 'examples']
    190       this_target.uselib_local = ['aubio']
     187      this_target.use = ['aubio']
    191188      this_target.uselib = ['JACK']
    192       this_target.source += ' examples/jackio.c'
    193 
    194 def build_extras(bld):
    195     # corner cases to build these ones only once
    196     sndfileio = bld.new_task_gen(features = 'cc',
    197         includes = 'examples src',
    198         source = ['examples/sndfileio.c'],
    199         target = 'sndfileio')
    200 
    201     defines = ['AUBIO_PREFIX="' + bld.env['AUBIO_PREFIX'] + '"']
    202     defines += ['PACKAGE="' + bld.env['PACKAGE'] + '"']
    203 
    204     utilsio = bld.new_task_gen(features = 'cc',
    205           includes = 'examples src',
    206           add_objects = 'sndfileio',
    207           source = ['examples/utils.c', 'examples/jackio.c'],
    208           uselib = ['LASH', 'JACK', 'SNDFILE'],
    209           defines = defines,
    210           target = 'utilsio')
     189      this_target.target += ' examples/jackio.c'
Note: See TracChangeset for help on using the changeset viewer.