From 60ae46507772b4560a34931c79fd4c49fc5fa11c Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 22 Apr 2011 21:11:55 +0000 Subject: Upgrade to waf 1.6.4. Fix wscript whitespace (PEP8). --- core.lv2/waf | Bin 86496 -> 87322 bytes waf | Bin 86496 -> 87322 bytes wscript | 112 +++++++++++++++++++++++++++++------------------------------ 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/core.lv2/waf b/core.lv2/waf index ccc19b6..3353d09 100755 Binary files a/core.lv2/waf and b/core.lv2/waf differ diff --git a/waf b/waf index ccc19b6..3353d09 100755 Binary files a/waf and b/waf differ diff --git a/wscript b/wscript index 1b62c6d..ed840d1 100644 --- a/wscript +++ b/wscript @@ -17,70 +17,70 @@ top = '.' out = 'build' def options(opt): - autowaf.set_options(opt) - opt.load('compiler_cc') - opt.load('compiler_cxx') - opt.recurse('core.lv2') + autowaf.set_options(opt) + opt.load('compiler_cc') + opt.load('compiler_cxx') + opt.recurse('core.lv2') def configure(conf): - autowaf.set_recursive() - autowaf.configure(conf) - conf.recurse('core.lv2'); - conf.load('compiler_cc') - conf.load('compiler_cxx') - conf.env.append_value('CFLAGS', '-std=c99') - pat = conf.env['cshlib_PATTERN'] - ext = pat[pat.rfind('.'):] - conf.env.append_value('cshlib_EXTENSION', ext) - conf.write_config_header('lv2-config.h', remove=False) + autowaf.set_recursive() + autowaf.configure(conf) + conf.recurse('core.lv2'); + conf.load('compiler_cc') + conf.load('compiler_cxx') + conf.env.append_value('CFLAGS', '-std=c99') + pat = conf.env['cshlib_PATTERN'] + ext = pat[pat.rfind('.'):] + conf.env.append_value('cshlib_EXTENSION', ext) + conf.write_config_header('lv2-config.h', remove=False) def build_extension(bld, name, dir): - data_file = '%s/%s.lv2/%s.ttl' % (dir, name, name) - manifest_file = '%s/%s.lv2/manifest.ttl' % (dir, name) - header_files = '%s/%s.lv2/*.h' % (dir, name) - bld.install_files('${LV2DIR}/' + name + '.lv2', bld.path.ant_glob(data_file)) - bld.install_files('${LV2DIR}/' + name + '.lv2', bld.path.ant_glob(manifest_file)) - bld.install_files('${LV2DIR}/' + name + '.lv2', bld.path.ant_glob(header_files)) + data_file = '%s/%s.lv2/%s.ttl' % (dir, name, name) + manifest_file = '%s/%s.lv2/manifest.ttl' % (dir, name) + header_files = '%s/%s.lv2/*.h' % (dir, name) + bld.install_files('${LV2DIR}/' + name + '.lv2', bld.path.ant_glob(data_file)) + bld.install_files('${LV2DIR}/' + name + '.lv2', bld.path.ant_glob(manifest_file)) + bld.install_files('${LV2DIR}/' + name + '.lv2', bld.path.ant_glob(header_files)) def build(bld): - autowaf.set_recursive() - bld.recurse('core.lv2') - ext = ''' - atom - contexts - data-access - dyn-manifest - event - host-info - instance-access - midi - osc - parameter - port-groups - presets - resize-port - string-port - pui - pui-event - pui-gtk - uri-map - uri-unmap - ''' - for e in ext.split(): - build_extension(bld, e, 'ext') + autowaf.set_recursive() + bld.recurse('core.lv2') + ext = ''' + atom + contexts + data-access + dyn-manifest + event + host-info + instance-access + midi + osc + parameter + port-groups + presets + resize-port + string-port + pui + pui-event + pui-gtk + uri-map + uri-unmap + ''' + for e in ext.split(): + build_extension(bld, e, 'ext') - extensions = ''' - ui - units - ''' - for e in extensions.split(): - build_extension(bld, e, 'extensions') + extensions = ''' + ui + units + ''' + for e in extensions.split(): + build_extension(bld, e, 'extensions') - bld.add_post_fun(warn_lv2config) + bld.add_post_fun(warn_lv2config) def warn_lv2config(ctx): - if ctx.cmd == 'install': - Logs.warn(''' - * LV2 Extension(s) Installed - * You need to run lv2config to update extension headers + if ctx.cmd == 'install': + Logs.warn(''' +* LV2 Extension(s) Installed +* You need to run lv2config to update extension headers ''') -- cgit v1.2.1