From 49855e52aad9a133d91a3ea5de1ff1fb5c76baab Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Sat, 9 Apr 2022 11:55:09 +0200 Subject: [PATCH] wscript: consistently have at most one empty separator line --- gtk2_ardour/wscript | 3 --- headless/wscript | 1 - libs/appleutility/wscript | 1 - libs/ardour/wscript | 1 - libs/ardouralsautil/wscript | 1 - libs/audiographer/wscript | 1 - libs/canvas/wscript | 1 - libs/gtkmm2ext/wscript | 1 - libs/midi++2/wscript | 1 - libs/panners/wscript | 1 - libs/qm-dsp/wscript | 1 - libs/surfaces/launch_control_xl/wscript | 4 ---- libs/surfaces/wscript | 1 - session_utils/wscript | 1 - wscript | 5 ----- 15 files changed, 24 deletions(-) diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index d8f131b061..752c31ad05 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -494,7 +494,6 @@ def _doPyp(infileName, deps = False): if fd != sys.stdin: fd.close() - for line in inLines: bits = re_spaces.split(line) if bits[0] == '##include': @@ -522,7 +521,6 @@ def include_processor(task): fdOut.write (_doPyp(infileName)) fdOut.close () - def build_color_scheme(path, prefix): f = open (path, 'r') color_scheme = '' @@ -622,7 +620,6 @@ def build(bld): # # obj.source += [ 'canvas_test.cc', ] # obj.source += [ 'toolbar_test.cc', 'enums.cc'] - # executable version of the GTK GUI if bld.env['build_target'] == 'mingw': obj = bld (features = 'cxx c cxxprogram winres') diff --git a/headless/wscript b/headless/wscript index 5b97c89427..37ca9050f2 100644 --- a/headless/wscript +++ b/headless/wscript @@ -24,7 +24,6 @@ def options(opt): def configure(conf): conf.load('misc') - def build(bld): VERSION = "%s.%s" % (bld.env['MAJOR'], bld.env['MINOR']) diff --git a/libs/appleutility/wscript b/libs/appleutility/wscript index 1480ffd623..e1e4ea705f 100644 --- a/libs/appleutility/wscript +++ b/libs/appleutility/wscript @@ -52,7 +52,6 @@ def build(bld): obj.target = 'appleutility' obj.install_path = os.path.join(bld.env['LIBDIR'], 'appleutility') - def shutdown(): autowaf.shutdown() diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 4afceb1687..7030c61769 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -376,7 +376,6 @@ def configure(conf): if conf.env['WINDOWS_VST_SUPPORT'] == True: conf.check(compiler='cxx', lib='gdi32', mandatory=True, uselib_store='GDI32') - def build(bld): # Library version (UNIX style major, minor, micro) # major increment <=> incompatible changes diff --git a/libs/ardouralsautil/wscript b/libs/ardouralsautil/wscript index a6fc2c214f..ea7ad64b35 100644 --- a/libs/ardouralsautil/wscript +++ b/libs/ardouralsautil/wscript @@ -14,7 +14,6 @@ path_prefix = 'libs/ardouralsautil/' def options(opt): autowaf.set_options(opt) - def configure(conf): if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw': autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA') diff --git a/libs/audiographer/wscript b/libs/audiographer/wscript index f76851f567..bc6160bf6d 100644 --- a/libs/audiographer/wscript +++ b/libs/audiographer/wscript @@ -92,7 +92,6 @@ def build(bld): audiographer.vnum = AUDIOGRAPHER_LIB_VERSION audiographer.install_path = bld.env['LIBDIR'] - if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'): # Unit tests obj = bld(features = 'cxx cxxprogram') diff --git a/libs/canvas/wscript b/libs/canvas/wscript index 7de151834e..300b2e9281 100644 --- a/libs/canvas/wscript +++ b/libs/canvas/wscript @@ -161,6 +161,5 @@ def build(bld): manual_testobj.target = target manual_testobj.install_path = '' - def shutdown(): autowaf.shutdown() diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript index de6cbb445f..c75059d707 100644 --- a/libs/gtkmm2ext/wscript +++ b/libs/gtkmm2ext/wscript @@ -65,7 +65,6 @@ def configure(conf): autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.8') autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.12.1') - def build(bld): # operate on copy to avoid adding sources twice sources = list(gtkmm2ext_sources) diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript index 985b68a60b..cc49cf0335 100644 --- a/libs/midi++2/wscript +++ b/libs/midi++2/wscript @@ -26,7 +26,6 @@ out = 'build' path_prefix = 'libs/midi++2/' - libmidi_sources = [ 'midi.cc', 'channel.cc', diff --git a/libs/panners/wscript b/libs/panners/wscript index ef79a82b05..731173ba42 100644 --- a/libs/panners/wscript +++ b/libs/panners/wscript @@ -7,7 +7,6 @@ import os top = '.' out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/qm-dsp/wscript b/libs/qm-dsp/wscript index a391ae6b74..a59801bf36 100644 --- a/libs/qm-dsp/wscript +++ b/libs/qm-dsp/wscript @@ -101,6 +101,5 @@ def build(bld): obj.cxxflags += [ bld.env['compiler_flags_dict']['pic'] ] obj.cflags += [ bld.env['compiler_flags_dict']['pic'] ] - def shutdown(): autowaf.shutdown() diff --git a/libs/surfaces/launch_control_xl/wscript b/libs/surfaces/launch_control_xl/wscript index d54dcdfb9f..5844176d7b 100644 --- a/libs/surfaces/launch_control_xl/wscript +++ b/libs/surfaces/launch_control_xl/wscript @@ -6,15 +6,12 @@ import os top = '.' out = 'build' - def options(opt): autowaf.set_options(opt) - def configure(conf): pass - def build(bld): obj = bld(features='cxx cxxshlib') obj.source = ''' @@ -36,6 +33,5 @@ def build(bld): obj.use = 'libardour libardour_cp libpbd libevoral libcanvas libtemporal' obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') - def shutdown(): autowaf.shutdown() diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript index 5804a7f637..25b38b7de4 100644 --- a/libs/surfaces/wscript +++ b/libs/surfaces/wscript @@ -80,7 +80,6 @@ def configure(conf): for i in children: sub_config_and_use(conf, i) - def build(bld): bld.recurse('control_protocol') bld.recurse('generic_midi') diff --git a/session_utils/wscript b/session_utils/wscript index 25bfc06e5e..b5c7477c0c 100644 --- a/session_utils/wscript +++ b/session_utils/wscript @@ -68,7 +68,6 @@ def build_ardour_util(bld, util): if bld.is_defined('NEED_INTL'): obj.linkflags = ' -lintl' - def build(bld): VERSION = "%s.%s" % (bld.env['MAJOR'], bld.env['MINOR']) # session-utils depend on the dummy backend diff --git a/wscript b/wscript index e6f5da3f78..babf6d7203 100644 --- a/wscript +++ b/wscript @@ -530,7 +530,6 @@ int main() { return 0; }''', cxx_flags.append('-DBOOST_NO_AUTO_PTR') cxx_flags.append('-DBOOST_BIND_GLOBAL_PLACEHOLDERS') - if (is_clang and platform == "darwin") or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan', 'sierra', 'high_sierra', 'mojave', 'catalina' , 'bigsur' ]: # Silence warnings about the non-existing osx clang compiler flags # -compatibility_version and -current_version. These are Waf @@ -546,7 +545,6 @@ int main() { return 0; }''', # distinguish 32 and 64 bit assembler # - if not (opt.arm64 or conf.env['build_target'] == 'armhf' and conf.env['build_target'] == 'aarch64'): compiler_flags.append ("-DARCH_X86") @@ -1085,7 +1083,6 @@ def configure(conf): else: print ('No Carbon support available for this build\n') - if Options.options.canvasui: conf.env['CANVASTESTUI'] = True conf.define ('CANVASTESTUI', 1) @@ -1361,7 +1358,6 @@ int main () { return 0; } or conf.env['BUILD_PULSEAUDIO']): conf.fatal("Must configure and build at least one backend") - if (Options.options.use_lld): if re.search ("linux", sys.platform) is not None and Options.options.dist_target != 'mingw' and conf.env['BUILD_PABACKEND']: conf.fatal("lld is only for Linux builds") @@ -1372,7 +1368,6 @@ int main () { return 0; } if re.search ("linux", sys.platform) is not None and Options.options.dist_target != 'mingw' and conf.env['BUILD_PABACKEND']: conf.fatal("PortAudio Backend is not for Linux") - if sys.platform != 'darwin' and conf.env['BUILD_CORECRAPPITA']: conf.fatal("Coreaudio backend is only available for OSX")