13
0

Strip trailing whitespace from waf scripts.

git-svn-id: svn://localhost/ardour2/branches/3.0@5045 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2009-05-04 22:10:15 +00:00
parent d76a5d9958
commit d3d1e2c286
19 changed files with 40 additions and 40 deletions

View File

@ -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')

View File

@ -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()

View File

@ -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')

View File

@ -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()

View File

@ -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()

View File

@ -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()

View File

@ -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()

View File

@ -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()

View File

@ -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()

View File

@ -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()

View File

@ -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()

View File

@ -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()

View File

@ -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()

View File

@ -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()

View File

@ -27,7 +27,7 @@ def configure(conf):
def build(bld):
bld.add_subdirs('control_protocol')
bld.add_subdirs('generic_midi')
def shutdown():
autowaf.shutdown()

View File

@ -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()

View File

@ -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()

View File

@ -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()

View File

@ -113,7 +113,7 @@ def set_options(opt):
help='Set X Modifier (Mod1,Mod2,Mod3,Mod4,Mod5) for "Windows" key [Default: Mod4]', default='Mod4><Super')
for i in children:
opt.sub_options(i)
def sub_config_and_use(conf, name, has_objects = True):
conf.sub_config(name)
autowaf.set_local_lib(conf, name, has_objects)
@ -126,7 +126,7 @@ def configure(conf):
autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.14.0')
for i in children:
sub_config_and_use(conf, i)
# Fix utterly braindead FLAC include path to not smash assert.h
conf.env['CPPPATH_FLAC'] = []