From d3d1e2c286fe31156557c2d304409f727c7c49c2 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 4 May 2009 22:10:15 +0000 Subject: [PATCH] Strip trailing whitespace from waf scripts. git-svn-id: svn://localhost/ardour2/branches/3.0@5045 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/wscript | 28 +++++++++++++------------- libs/ardour/wscript | 8 ++++---- libs/evoral/wscript | 6 +++--- libs/midi++2/wscript | 2 +- libs/pbd/wscript | 2 +- libs/rubberband/wscript | 2 +- libs/surfaces/control_protocol/wscript | 2 +- libs/surfaces/frontier/wscript | 2 +- libs/surfaces/generic_midi/wscript | 2 +- libs/surfaces/mackie/wscript | 2 +- libs/surfaces/osc/wscript | 2 +- libs/surfaces/powermate/wscript | 2 +- libs/surfaces/tranzport/wscript | 2 +- libs/surfaces/wiimote/wscript | 2 +- libs/surfaces/wscript | 2 +- libs/taglib/wscript | 4 ++-- libs/vamp-plugins/wscript | 2 +- libs/vamp-sdk/wscript | 4 ++-- wscript | 4 ++-- 19 files changed, 40 insertions(+), 40 deletions(-) diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 7ff8402d2d..8bb973c4e6 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -27,7 +27,7 @@ def configure(conf): 'gtk2_ardour', MAJOR, MINOR, MICRO) autowaf.configure(conf) autowaf.check_tool(conf, 'compiler_cxx') - + autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA') autowaf.check_pkg(conf, 'flac', uselib_store='FLAC', atleast_version='1.2.1') autowaf.check_pkg(conf, 'gthread', uselib_store='GTHREAD', atleast_version='2.10.1') @@ -36,12 +36,12 @@ def configure(conf): autowaf.check_pkg(conf, 'libgnomecanvas-2.0', uselib_store='GNOMECANVAS', atleast_version='2.0') autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6', uselib_store='GNOMECANVASMM', atleast_version='2.12.0') autowaf.check_pkg(conf, 'ogg', uselib_store='OGG', atleast_version='1.1.2') - + conf.check_tool('misc') # subst tool conf.env.append_value('CCFLAGS', '-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE') conf.env.append_value('CXXFLAGS', '-DENABLE_NLS') - + conf.env.append_value('CXXFLAGS', '-DHAVE_WAFCONFIG_H') conf.write_config_header('wafconfig.h') @@ -231,7 +231,7 @@ def build(bld): obj.source += ' lv2_plugin_ui.cc ' obj.uselib += ' SLV2 ' obj.cxxflags += ['-DHAVE_SLV2'] - + # Wrappers wrapper_subst_dict = { @@ -247,16 +247,16 @@ def build(bld): obj.target = 'ardev_common_waf.sh' obj.chmod = 0755 obj.dict = wrapper_subst_dict - + obj = bld.new_task_gen('subst') obj.source = 'ardour.sh.in' obj.target = 'ardour3' obj.chmod = 0755 obj.dict = wrapper_subst_dict obj.install_path = bld.env['BINDIR'] - + # Font configuration - + font_subst_dict = {} font_sizes = {} base_font = "" @@ -304,31 +304,31 @@ def build(bld): } # RC files - + obj = bld.new_task_gen('subst') obj.source = 'ardour3_ui_dark.rc.in' obj.target = 'ardour3_ui_dark.rc' obj.dict = font_subst_dict obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3') - + obj = bld.new_task_gen('subst') obj.source = 'ardour3_ui_light.rc.in' obj.target = 'ardour3_ui_light.rc' obj.dict = font_subst_dict obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3') - + obj = bld.new_task_gen('subst') obj.source = 'ardour3_ui_dark_sae.rc.in' obj.target = 'ardour3_ui_dark_sae.rc' obj.dict = font_subst_dict obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3') - + obj = bld.new_task_gen('subst') obj.source = 'ardour3_ui_light_sae.rc.in' obj.target = 'ardour3_ui_light_sae.rc' obj.dict = font_subst_dict obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3') - + # Menus menus_argv = [] if bld.env['GTKOSX']: @@ -357,14 +357,14 @@ def build(bld): keybindings_dict['%TERTIARY%'] = 'Shift' keybindings_dict['%LEVEL4%'] = bld.env['WINDOWS_KEY'] keybindings_dict['%WINDOW%'] = 'Alt' - + for b in [ 'SAE-de-keypad', 'SAE-de-nokeypad', 'SAE-us-keypad', 'SAE-us-nokeypad', 'mnemonic-us', 'ergonomic-us' ]: obj = bld.new_task_gen('subst') obj.target = b + '.bindings' obj.source = obj.target + '.in' obj.dict = keybindings_dict - + # Icons/Images bld.install_files('${DATADIR}/ardour3/icons', 'icons/*.png') bld.install_files('${DATADIR}/ardour3/pixmaps', 'pixmaps/*.xpm') diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 7d3258eb80..e2734eb4c1 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -33,7 +33,7 @@ def check_header_and_define(conf, header, define): if conf.env[define]: conf.env.append_value('CCFLAGS', '-D' + define) conf.env.append_value('CXXFLAGS', '-D' + define) - + def configure(conf): autowaf.build_version_files(path_prefix+'ardour/version.h', path_prefix+'version.cc', 'libardour3', MAJOR, MINOR, MICRO) @@ -51,13 +51,13 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DUSE_RUBBERBAND') conf.define('HAVE_RUBBERBAND', 1) - + check_header_and_define(conf, 'sys/vfs.h', 'HAVE_SYS_VFS_H') check_header_and_define(conf, 'wordexp.h', 'HAVE_WORDEXP') conf.env.append_value('CCFLAGS', '-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE') conf.env.append_value('CXXFLAGS', '-DENABLE_NLS') - + conf.env.append_value('CXXFLAGS', '-DHAVE_WAFCONFIG_H') conf.write_config_header('wafconfig.h') @@ -235,7 +235,7 @@ def build(bld): obj.source += ' lv2_plugin.cc lv2_event_buffer.cc uri_map.cc ' obj.uselib += ' LRDF SLV2' obj.cxxflags += ['-DHAVE_SLV2'] - + def shutdown(): autowaf.shutdown() diff --git a/libs/evoral/wscript b/libs/evoral/wscript index 20a2088d17..a00ea26c43 100644 --- a/libs/evoral/wscript +++ b/libs/evoral/wscript @@ -40,10 +40,10 @@ def build(bld): # Headers #bld.install_files('${INCLUDEDIR}/evoral', 'evoral/*.h') #bld.install_files('${INCLUDEDIR}/evoral', 'evoral/*.hpp') - + # Pkgconfig file #autowaf.build_pc(bld, 'EVORAL', EVORAL_VERSION, 'GLIBMM GTHREAD') - + libsmf = bld.new_task_gen('cc', 'shlib') libsmf.source = ''' src/libsmf/smf.c @@ -81,7 +81,7 @@ def build(bld): obj.uselib_local = 'libsmf' obj.vnum = EVORAL_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - + if bld.env['HAVE_CPPUNIT']: # Unit tests obj = bld.new_task_gen('cxx', 'program') diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript index 58fc16386d..2be7610e0f 100644 --- a/libs/midi++2/wscript +++ b/libs/midi++2/wscript @@ -78,7 +78,7 @@ def build(bld): obj.uselib_local = 'libpbd libevoral' obj.vnum = LIBMIDIPP_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - + def shutdown(): autowaf.shutdown() diff --git a/libs/pbd/wscript b/libs/pbd/wscript index e6f6ebd4fc..f19fbfdc82 100644 --- a/libs/pbd/wscript +++ b/libs/pbd/wscript @@ -95,7 +95,7 @@ def build(bld): obj.cxxflags = ['-DPACKAGE="libpbd"'] if bld.env['PBD_HAVE_EXECINFO']: obj.cxxflags += ['-DHAVE_EXECINFO'] - + def shutdown(): autowaf.shutdown() diff --git a/libs/rubberband/wscript b/libs/rubberband/wscript index b5f0e2ad7a..9cf5dbda8e 100644 --- a/libs/rubberband/wscript +++ b/libs/rubberband/wscript @@ -59,7 +59,7 @@ def build(bld): obj.vnum = LIBRUBBERBAND_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') obj.cxxflags = '-DPACKAGE="librubberband"' - + def shutdown(): autowaf.shutdown() diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript index 7994bcf77e..c084e33696 100644 --- a/libs/surfaces/control_protocol/wscript +++ b/libs/surfaces/control_protocol/wscript @@ -33,7 +33,7 @@ def build(bld): obj.uselib_local = 'libardour' obj.vnum = LIBSURFACES_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - + def shutdown(): autowaf.shutdown() diff --git a/libs/surfaces/frontier/wscript b/libs/surfaces/frontier/wscript index d063008a78..702237d695 100644 --- a/libs/surfaces/frontier/wscript +++ b/libs/surfaces/frontier/wscript @@ -41,7 +41,7 @@ def build(bld): obj.uselib_local = 'libardour libsurfaces' obj.vnum = LIBSURFACES_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - + def shutdown(): autowaf.shutdown() diff --git a/libs/surfaces/generic_midi/wscript b/libs/surfaces/generic_midi/wscript index 81a8bda792..4993d24ef9 100644 --- a/libs/surfaces/generic_midi/wscript +++ b/libs/surfaces/generic_midi/wscript @@ -33,7 +33,7 @@ def build(bld): obj.uselib_local = 'libardour libsurfaces' obj.vnum = LIBSURFACES_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - + def shutdown(): autowaf.shutdown() diff --git a/libs/surfaces/mackie/wscript b/libs/surfaces/mackie/wscript index e8d5216694..725a220851 100644 --- a/libs/surfaces/mackie/wscript +++ b/libs/surfaces/mackie/wscript @@ -48,7 +48,7 @@ def build(bld): obj.uselib_local = 'libardour libsurfaces' obj.vnum = LIBSURFACES_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - + def shutdown(): autowaf.shutdown() diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript index 95566b9339..748b0f6940 100644 --- a/libs/surfaces/osc/wscript +++ b/libs/surfaces/osc/wscript @@ -40,7 +40,7 @@ def build(bld): obj.uselib_local = 'libardour' obj.vnum = LIBSURFACES_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - + def shutdown(): autowaf.shutdown() diff --git a/libs/surfaces/powermate/wscript b/libs/surfaces/powermate/wscript index 2ce356b0f4..3d08b1a40a 100644 --- a/libs/surfaces/powermate/wscript +++ b/libs/surfaces/powermate/wscript @@ -32,7 +32,7 @@ def build(bld): obj.uselib_local = 'libardour libsurfaces' obj.vnum = LIBSURFACES_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - + def shutdown(): autowaf.shutdown() diff --git a/libs/surfaces/tranzport/wscript b/libs/surfaces/tranzport/wscript index d6ab02471a..dec4b9c1d3 100644 --- a/libs/surfaces/tranzport/wscript +++ b/libs/surfaces/tranzport/wscript @@ -46,7 +46,7 @@ def build(bld): obj.uselib_local = 'libardour libsurfaces' obj.vnum = LIBSURFACES_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - + def shutdown(): autowaf.shutdown() diff --git a/libs/surfaces/wiimote/wscript b/libs/surfaces/wiimote/wscript index b5c6e1cd28..fd03b1724a 100644 --- a/libs/surfaces/wiimote/wscript +++ b/libs/surfaces/wiimote/wscript @@ -32,7 +32,7 @@ def build(bld): obj.uselib_local = 'libardour libsurfaces' obj.vnum = LIBSURFACES_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - + def shutdown(): autowaf.shutdown() diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript index 24f7d060ed..bd37af7426 100644 --- a/libs/surfaces/wscript +++ b/libs/surfaces/wscript @@ -27,7 +27,7 @@ def configure(conf): def build(bld): bld.add_subdirs('control_protocol') bld.add_subdirs('generic_midi') - + def shutdown(): autowaf.shutdown() diff --git a/libs/taglib/wscript b/libs/taglib/wscript index f0754c9b22..d496360ed6 100644 --- a/libs/taglib/wscript +++ b/libs/taglib/wscript @@ -50,7 +50,7 @@ def build(bld): obj.source = [] for i in sources: obj.source += [ i.replace(path_prefix, '') ] - + include_dirs = ''' taglib taglib/toolkit @@ -73,7 +73,7 @@ def build(bld): obj.target = 'taglib' obj.vnum = LIBTAGLIB_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - + def shutdown(): autowaf.shutdown() diff --git a/libs/vamp-plugins/wscript b/libs/vamp-plugins/wscript index 38ffd76334..4768523e16 100644 --- a/libs/vamp-plugins/wscript +++ b/libs/vamp-plugins/wscript @@ -49,7 +49,7 @@ def build(bld): obj.uselib += ' AUBIO ' obj.vnum = LIBARDOURVAMPPLUGINS_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - + def shutdown(): autowaf.shutdown() diff --git a/libs/vamp-sdk/wscript b/libs/vamp-sdk/wscript index 2fbc31c666..b608ce5bb2 100644 --- a/libs/vamp-sdk/wscript +++ b/libs/vamp-sdk/wscript @@ -48,7 +48,7 @@ def build(bld): obj.uselib = 'FFTW3 FFTW3F' obj.vnum = LIBVAMP_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - + # Plugin Library obj = bld.new_task_gen('cxx', 'shlib') obj.source = ''' @@ -62,7 +62,7 @@ def build(bld): obj.uselib = 'FFTW3 FFTW3F' obj.vnum = LIBVAMP_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - + def shutdown(): autowaf.shutdown() diff --git a/wscript b/wscript index e42dbbea31..471ed1f0bf 100644 --- a/wscript +++ b/wscript @@ -113,7 +113,7 @@ def set_options(opt): help='Set X Modifier (Mod1,Mod2,Mod3,Mod4,Mod5) for "Windows" key [Default: Mod4]', default='Mod4>