From 07821c99f75c574bff76cb6c7ceefa4f3d597140 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 8 Dec 2019 14:38:49 +0100 Subject: Cleanup: Format Python code to be mostly flake8 clean --- src/client/wscript | 2 +- src/gui/wscript | 5 +++- src/server/wscript | 86 +++++++++++++++++++++++++++--------------------------- src/wscript | 30 +++++++++---------- 4 files changed, 63 insertions(+), 60 deletions(-) (limited to 'src') diff --git a/src/client/wscript b/src/client/wscript index 805d8c86..394c9e4d 100644 --- a/src/client/wscript +++ b/src/client/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -from waflib.extras import autowaf as autowaf + def build(bld): obj = bld(features = 'cxx cxxshlib', diff --git a/src/gui/wscript b/src/gui/wscript index a483f5a4..b33bd31e 100644 --- a/src/gui/wscript +++ b/src/gui/wscript @@ -1,13 +1,15 @@ #!/usr/bin/env python -import waflib.extras.autowaf as autowaf + import waflib.Utils as Utils import waflib.Options as Options + def options(ctx): opt = ctx.configuration_options() opt.add_option('--light-theme', action='store_true', dest='light_theme', help='use light coloured theme') + def configure(conf): conf.check_pkg('glibmm-2.4 >= 2.14.0', uselib_store='GLIBMM', @@ -36,6 +38,7 @@ def configure(conf): if Options.options.light_theme: conf.define('INGEN_USE_LIGHT_THEME', 1) + def build(bld): obj = bld(features = 'cxx cxxshlib', cflags = ['-fvisibility=hidden'], diff --git a/src/server/wscript b/src/server/wscript index f01c6e0b..00588915 100644 --- a/src/server/wscript +++ b/src/server/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -from waflib.extras import autowaf as autowaf + def build(bld): core_source = ''' @@ -55,52 +55,52 @@ def build(bld): core_libs = 'LV2 LILV RAUL SERD SORD SRATOM' - obj = bld(features = 'cxx cxxshlib', - source = core_source, - export_includes = ['../..'], - includes = ['.', '../..'], - name = 'libingen_server', - target = 'ingen_server', - install_path = '${LIBDIR}', - use = 'libingen libingen_socket', - uselib = core_libs, - cxxflags = bld.env.PTHREAD_CFLAGS + bld.env.INGEN_TEST_CXXFLAGS, - linkflags = bld.env.PTHREAD_LINKFLAGS + bld.env.INGEN_TEST_LINKFLAGS) + bld(features = 'cxx cxxshlib', + source = core_source, + export_includes = ['../..'], + includes = ['.', '../..'], + name = 'libingen_server', + target = 'ingen_server', + install_path = '${LIBDIR}', + use = 'libingen libingen_socket', + uselib = core_libs, + cxxflags = bld.env.PTHREAD_CFLAGS + bld.env.INGEN_TEST_CXXFLAGS, + linkflags = bld.env.PTHREAD_LINKFLAGS + bld.env.INGEN_TEST_LINKFLAGS) if bld.env.HAVE_JACK: - obj = bld(features = 'cxx cxxshlib', - source = 'JackDriver.cpp ingen_jack.cpp', - includes = ['.', '../..'], - name = 'libingen_jack', - target = 'ingen_jack', - install_path = '${LIBDIR}', - use = 'libingen_server', - uselib = core_libs + ' JACK', - cxxflags = ['-fvisibility=hidden'] + bld.env.PTHREAD_CFLAGS, - linkflags = bld.env.PTHREAD_LINKFLAGS) + bld(features = 'cxx cxxshlib', + source = 'JackDriver.cpp ingen_jack.cpp', + includes = ['.', '../..'], + name = 'libingen_jack', + target = 'ingen_jack', + install_path = '${LIBDIR}', + use = 'libingen_server', + uselib = core_libs + ' JACK', + cxxflags = ['-fvisibility=hidden'] + bld.env.PTHREAD_CFLAGS, + linkflags = bld.env.PTHREAD_LINKFLAGS) if bld.env.HAVE_PORTAUDIO: - obj = bld(features = 'cxx cxxshlib', - source = 'PortAudioDriver.cpp ingen_portaudio.cpp', - includes = ['.', '../..'], - name = 'libingen_portaudio', - target = 'ingen_portaudio', - install_path = '${LIBDIR}', - use = 'libingen_server', - uselib = core_libs + ' PORTAUDIO', - cxxflags = ['-fvisibility=hidden'] + bld.env.PTHREAD_CFLAGS, - linkflags = bld.env.PTHREAD_LINKFLAGS) + bld(features = 'cxx cxxshlib', + source = 'PortAudioDriver.cpp ingen_portaudio.cpp', + includes = ['.', '../..'], + name = 'libingen_portaudio', + target = 'ingen_portaudio', + install_path = '${LIBDIR}', + use = 'libingen_server', + uselib = core_libs + ' PORTAUDIO', + cxxflags = ['-fvisibility=hidden'] + bld.env.PTHREAD_CFLAGS, + linkflags = bld.env.PTHREAD_LINKFLAGS) # Ingen LV2 wrapper if bld.env.INGEN_BUILD_LV2: - obj = bld(features = 'cxx cxxshlib', - source = ' ingen_lv2.cpp ', - cflags = ['-fvisibility=hidden'], - includes = ['.', '../..'], - name = 'libingen_lv2', - target = 'ingen_lv2', - install_path = '${LV2DIR}/ingen.lv2/', - use = 'libingen libingen_server', - uselib = core_libs, - cxxflags = ['-fvisibility=hidden'] + bld.env.PTHREAD_CFLAGS, - linkflags = bld.env.PTHREAD_LINKFLAGS) + bld(features = 'cxx cxxshlib', + source = ' ingen_lv2.cpp ', + cflags = ['-fvisibility=hidden'], + includes = ['.', '../..'], + name = 'libingen_lv2', + target = 'ingen_lv2', + install_path = '${LV2DIR}/ingen.lv2/', + use = 'libingen libingen_server', + uselib = core_libs, + cxxflags = ['-fvisibility=hidden'] + bld.env.PTHREAD_CFLAGS, + linkflags = bld.env.PTHREAD_LINKFLAGS) diff --git a/src/wscript b/src/wscript index ee4311e1..72c7d48c 100644 --- a/src/wscript +++ b/src/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -from waflib.extras import autowaf as autowaf + def build(bld): sources = [ @@ -26,22 +26,22 @@ def build(bld): 'runtime_paths.cpp' ] if bld.is_defined('HAVE_SOCKET'): - sources += [ 'SocketReader.cpp', 'SocketWriter.cpp' ] + sources += ['SocketReader.cpp', 'SocketWriter.cpp'] lib = [] if bld.is_defined('HAVE_LIBDL'): lib += ['dl'] - obj = bld(features = 'cxx cxxshlib', - source = sources, - export_includes = ['..'], - includes = ['..'], - name = 'libingen', - target = 'ingen-%s' % bld.env.INGEN_MAJOR_VERSION, - vnum = bld.env.INGEN_VERSION, - install_path = '${LIBDIR}', - lib = lib, - uselib = 'LV2 LILV RAUL SERD SORD SRATOM', - cxxflags = (['-fvisibility=hidden'] + - bld.env.PTHREAD_CFLAGS + bld.env.INGEN_TEST_CXXFLAGS), - linkflags = bld.env.PTHREAD_LINKFLAGS + bld.env.INGEN_TEST_LINKFLAGS) + bld(features = 'cxx cxxshlib', + source = sources, + export_includes = ['..'], + includes = ['..'], + name = 'libingen', + target = 'ingen-%s' % bld.env.INGEN_MAJOR_VERSION, + vnum = bld.env.INGEN_VERSION, + install_path = '${LIBDIR}', + lib = lib, + uselib = 'LV2 LILV RAUL SERD SORD SRATOM', + cxxflags = (['-fvisibility=hidden'] + + bld.env.PTHREAD_CFLAGS + bld.env.INGEN_TEST_CXXFLAGS), + linkflags = bld.env.PTHREAD_LINKFLAGS + bld.env.INGEN_TEST_LINKFLAGS) -- cgit v1.2.1