13
0

wscript: drop traces of shutdown() handling

autowaf has no real shutdown functionality anyway. The automatic
shutdown function that could have been called wouldn't work anyway, as
it takes an argument.

The only reason it doesn't fail is that the top level wscript has no
shutdown handling and doesn't recurse to other scripts, so it is all
dead code.
This commit is contained in:
Mads Kiilerich 2022-01-25 00:16:35 +01:00 committed by Paul Davis
parent 92aca32652
commit 6b61b03434
41 changed files with 0 additions and 143 deletions

View File

@ -52,8 +52,5 @@ def build(bld):
obj.target = 'appleutility' obj.target = 'appleutility'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'appleutility') obj.install_path = os.path.join(bld.env['LIBDIR'], 'appleutility')
def shutdown():
autowaf.shutdown()
def i18n(bld): def i18n(bld):
pass pass

View File

@ -718,9 +718,6 @@ def create_ardour_test_program(bld, includes, name, target, sources):
'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"', 'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
] ]
def shutdown():
autowaf.shutdown()
def i18n(bld): def i18n(bld):
autowaf.build_i18n(bld, '.', 'libs/ardour', I18N_PACKAGE + str(bld.env['MAJOR']), libardour_sources, autowaf.build_i18n(bld, '.', 'libs/ardour', I18N_PACKAGE + str(bld.env['MAJOR']), libardour_sources,
'Paul Davis') 'Paul Davis')

View File

@ -120,6 +120,3 @@ def build(bld):
obj.target = 'run-tests' obj.target = 'run-tests'
obj.name = 'audiographer-unit-tests' obj.name = 'audiographer-unit-tests'
obj.install_path = '' obj.install_path = ''
def shutdown():
autowaf.shutdown()

View File

@ -150,6 +150,3 @@ def build(bld):
manual_testobj.name = 'libcanvas-benchmark-%s' % name manual_testobj.name = 'libcanvas-benchmark-%s' % name
manual_testobj.target = target manual_testobj.target = target
manual_testobj.install_path = '' manual_testobj.install_path = ''
def shutdown():
autowaf.shutdown()

View File

@ -39,6 +39,3 @@ def build(bld):
elif bld.env['build_target'] != 'mingw': elif bld.env['build_target'] != 'mingw':
# this is a hack so that running ./ardev will work, since it sets GTK_PATH to include this dir and GTK will search {thisdir}/engines # this is a hack so that running ./ardev will work, since it sets GTK_PATH to include this dir and GTK will search {thisdir}/engines
obj = bld(target = 'engines', rule = 'mkdir -p ${TGT} && rm -f ${TGT}/libclearlooks.so && ln -s ../libclearlooks.so ${TGT}/libclearlooks.so') obj = bld(target = 'engines', rule = 'mkdir -p ${TGT} && rm -f ${TGT}/libclearlooks.so && ln -s ../libclearlooks.so ${TGT}/libclearlooks.so')
def shutdown():
autowaf.shutdown()

View File

@ -1,5 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
from waflib.extras import autowaf as autowaf
controlcp_sources = [ controlcp_sources = [
'basic_ui.cc', 'basic_ui.cc',
@ -30,6 +29,3 @@ def build(bld):
obj.use = 'libardour libpbd' obj.use = 'libardour libpbd'
obj.uselib = 'GLIBMM SIGCPP XML OSX' obj.uselib = 'GLIBMM SIGCPP XML OSX'
obj.install_path = bld.env['LIBDIR'] obj.install_path = bld.env['LIBDIR']
def shutdown():
autowaf.shutdown()

View File

@ -59,6 +59,3 @@ def build(bld):
uselib = 'GLIB', uselib = 'GLIB',
defines = [ 'HAVE_CONFIG_H', 'DEFAULT_SOUNDFONT=""' ] defines = [ 'HAVE_CONFIG_H', 'DEFAULT_SOUNDFONT=""' ]
) )
def shutdown():
autowaf.shutdown()

View File

@ -108,6 +108,3 @@ def i18n_po(bld):
def i18n_mo(bld): def i18n_mo(bld):
autowaf.build_i18n_mo(bld, '.', 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources, autowaf.build_i18n_mo(bld, '.', 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources,
'Paul Davis') 'Paul Davis')
def shutdown():
autowaf.shutdown()

View File

@ -53,6 +53,3 @@ def build(bld):
obj.source = 'linux/hid.c' obj.source = 'linux/hid.c'
if re.search ("linux", sys.platform) != None: if re.search ("linux", sys.platform) != None:
obj.uselib = 'UDEV' obj.uselib = 'UDEV'
def shutdown():
autowaf.shutdown()

View File

@ -35,6 +35,3 @@ def build(bld):
target = 'libltc', target = 'libltc',
use = 'libltc_includes' use = 'libltc_includes'
) )
def shutdown():
autowaf.shutdown()

View File

@ -19,6 +19,3 @@ def build(bld):
uselib = [ 'SIGCPP', 'DL' ] uselib = [ 'SIGCPP', 'DL' ]
) )
autowaf.ensure_visible_symbols (obj, True) autowaf.ensure_visible_symbols (obj, True)
def shutdown():
autowaf.shutdown()

View File

@ -66,6 +66,3 @@ def build(bld):
obj.target = 'run-tests' obj.target = 'run-tests'
obj.name = 'libmidipp-tests' obj.name = 'libmidipp-tests'
obj.install_path = '' obj.install_path = ''
def shutdown():
autowaf.shutdown()

View File

@ -1,5 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
from waflib.extras import autowaf as autowaf
import os import os
def options(opt): def options(opt):
@ -19,6 +18,3 @@ def build(bld):
obj.use = 'libardour libardour_cp libpbd' obj.use = 'libardour libardour_cp libpbd'
obj.uselib = 'GLIBMM XML OSX' obj.uselib = 'GLIBMM XML OSX'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners') obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners')
def shutdown():
autowaf.shutdown()

View File

@ -1,5 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
from waflib.extras import autowaf as autowaf
import os import os
def options(opt): def options(opt):
@ -19,6 +18,3 @@ def build(bld):
obj.use = 'libardour libardour_cp libpbd' obj.use = 'libardour libardour_cp libpbd'
obj.uselib = 'GLIBMM XML OSX' obj.uselib = 'GLIBMM XML OSX'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners') obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners')
def shutdown():
autowaf.shutdown()

View File

@ -1,5 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
from waflib.extras import autowaf as autowaf
import os import os
def options(opt): def options(opt):
@ -19,6 +18,3 @@ def build(bld):
obj.use = 'libardour libardour_cp libpbd' obj.use = 'libardour libardour_cp libpbd'
obj.uselib = 'GLIBMM XML OSX' obj.uselib = 'GLIBMM XML OSX'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners') obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners')
def shutdown():
autowaf.shutdown()

View File

@ -1,5 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
from waflib.extras import autowaf as autowaf
import os import os
def options(opt): def options(opt):
@ -19,6 +18,3 @@ def build(bld):
obj.use = 'libardour libardour_cp libpbd' obj.use = 'libardour libardour_cp libpbd'
obj.uselib = 'GLIBMM XML OSX' obj.uselib = 'GLIBMM XML OSX'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners') obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners')
def shutdown():
autowaf.shutdown()

View File

@ -1,5 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
from waflib.extras import autowaf as autowaf
# Version of this package (even if built as a child) # Version of this package (even if built as a child)
LIBPTFORMAT_VERSION = '0.0.0' LIBPTFORMAT_VERSION = '0.0.0'
@ -37,6 +36,3 @@ def build(bld):
obj.vnum = LIBPTFORMAT_LIB_VERSION obj.vnum = LIBPTFORMAT_LIB_VERSION
obj.install_path = bld.env['LIBDIR'] obj.install_path = bld.env['LIBDIR']
obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ] obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
def shutdown():
autowaf.shutdown()

View File

@ -97,6 +97,3 @@ def build(bld):
if bld.env['build_target'] != 'mingw': if bld.env['build_target'] != 'mingw':
obj.cxxflags += [ bld.env['compiler_flags_dict']['pic'] ] obj.cxxflags += [ bld.env['compiler_flags_dict']['pic'] ]
obj.cflags += [ bld.env['compiler_flags_dict']['pic'] ] obj.cflags += [ bld.env['compiler_flags_dict']['pic'] ]
def shutdown():
autowaf.shutdown()

View File

@ -1,5 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
from waflib.extras import autowaf as autowaf
import os import os
def options(opt): def options(opt):
@ -24,6 +23,3 @@ def build(bld):
obj.uselib = 'GTKMM GTK GDK XML OSX' obj.uselib = 'GTKMM GTK GDK XML OSX'
obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' obj.use = 'libardour libardour_cp libgtkmm2ext libpbd'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
def shutdown():
autowaf.shutdown()

View File

@ -1,5 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
from waflib.extras import autowaf as autowaf
import os import os
def options(opt): def options(opt):
@ -25,6 +24,3 @@ def build(bld):
obj.uselib = 'GTKMM USB XML OSX' obj.uselib = 'GTKMM USB XML OSX'
obj.use = 'libardour libardour_cp libgtkmm2ext libpbd libwidgets' obj.use = 'libardour libardour_cp libgtkmm2ext libpbd libwidgets'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
def shutdown():
autowaf.shutdown()

View File

@ -1,5 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
from waflib.extras import autowaf as autowaf
import os import os
def options(opt): def options(opt):
@ -24,6 +23,3 @@ def build(bld):
obj.uselib = 'GTKMM GTK GDK XML OSX' obj.uselib = 'GTKMM GTK GDK XML OSX'
obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd' obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
def shutdown():
autowaf.shutdown()

View File

@ -1,5 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
from waflib.extras import autowaf as autowaf
import os import os
fp8_16_sources = [ fp8_16_sources = [
@ -55,6 +54,3 @@ def build(bld):
obj.uselib = 'GTKMM GTK GDK XML OSX' obj.uselib = 'GTKMM GTK GDK XML OSX'
obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' obj.use = 'libardour libardour_cp libgtkmm2ext libpbd'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
def shutdown():
autowaf.shutdown()

View File

@ -1,5 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
from waflib.extras import autowaf as autowaf
import os import os
def options(opt): def options(opt):
@ -24,6 +23,3 @@ def build(bld):
obj.uselib = 'XML OSX' obj.uselib = 'XML OSX'
obj.use = 'libardour libardourcp' obj.use = 'libardour libardourcp'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
def shutdown():
autowaf.shutdown()

View File

@ -1,5 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
from waflib.extras import autowaf as autowaf
import os import os
def options(opt): def options(opt):
@ -28,6 +27,3 @@ def build(bld):
obj.uselib = 'GTKMM GTK GDK XML OSX' obj.uselib = 'GTKMM GTK GDK XML OSX'
obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' obj.use = 'libardour libardour_cp libgtkmm2ext libpbd'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
def shutdown():
autowaf.shutdown()

View File

@ -1,5 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
from waflib.extras import autowaf as autowaf
import os import os
def options(opt): def options(opt):
@ -27,6 +26,3 @@ def build(bld):
obj.uselib = 'GTKMM SIGCPP XML OSX' obj.uselib = 'GTKMM SIGCPP XML OSX'
obj.use = 'libardour libardour_cp libpbd libevoral libcanvas libtemporal' obj.use = 'libardour libardour_cp libpbd libevoral libcanvas libtemporal'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
def shutdown():
autowaf.shutdown()

View File

@ -1,5 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
from waflib.extras import autowaf as autowaf
import os import os
mackie_sources = [ mackie_sources = [
@ -56,6 +55,3 @@ def build(bld):
obj.uselib = 'GTKMM XML OSX' obj.uselib = 'GTKMM XML OSX'
obj.use = 'libardour libardour_cp libgtkmm2ext' obj.use = 'libardour libardour_cp libgtkmm2ext'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
def shutdown():
autowaf.shutdown()

View File

@ -33,6 +33,3 @@ def build(bld):
obj.uselib = 'CAIROMM PANGOMM GTKMM GTK XML OSX' obj.uselib = 'CAIROMM PANGOMM GTKMM GTK XML OSX'
obj.use = 'libardour libardour_cp libpbd libcanvas hidapi libgtkmm2ext' obj.use = 'libardour libardour_cp libpbd libcanvas hidapi libgtkmm2ext'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
def shutdown():
autowaf.shutdown()

View File

@ -1,5 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
from waflib.extras import autowaf as autowaf
import os import os
def options(opt): def options(opt):
@ -28,6 +27,3 @@ def build(bld):
obj.uselib = 'LO GTKMM GTK GDK XML OSX' obj.uselib = 'LO GTKMM GTK GDK XML OSX'
obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' obj.use = 'libardour libardour_cp libgtkmm2ext libpbd'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
def shutdown():
autowaf.shutdown()

View File

@ -39,6 +39,3 @@ def build(bld):
obj.uselib = 'CAIROMM PANGOMM USB GTKMM SIGCPP XML OSX' obj.uselib = 'CAIROMM PANGOMM USB GTKMM SIGCPP XML OSX'
obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal' obj.use = 'libardour libardour_cp libardour_midisurface libgtkmm2ext libpbd libevoral libcanvas libtemporal'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
def shutdown():
autowaf.shutdown()

View File

@ -1,5 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
from waflib.extras import autowaf as autowaf
import os import os
def options(opt): def options(opt):
@ -36,6 +35,3 @@ def build(bld):
obj.uselib = 'XML OSX' obj.uselib = 'XML OSX'
obj.use = 'libardour libardour_cp' obj.use = 'libardour libardour_cp'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
def shutdown():
autowaf.shutdown()

View File

@ -1,5 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
from waflib.extras import autowaf as autowaf
import os import os
def options(opt): def options(opt):
@ -39,6 +38,3 @@ def build(bld):
obj.uselib = 'GTKMM XML OSX' obj.uselib = 'GTKMM XML OSX'
obj.use = 'libardour libardour_cp libgtkmm2ext' obj.use = 'libardour libardour_cp libgtkmm2ext'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
def shutdown():
autowaf.shutdown()

View File

@ -1,5 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
from waflib.extras import autowaf as autowaf
import os import os
def options(opt): def options(opt):
@ -38,6 +37,3 @@ def build(bld):
if bld.env['build_target'] == 'mingw': if bld.env['build_target'] == 'mingw':
obj.defines+= [ '_WIN32_WINNT=0x0601', 'WINVER=0x0601' ] obj.defines+= [ '_WIN32_WINNT=0x0601', 'WINVER=0x0601' ]
def shutdown():
autowaf.shutdown()

View File

@ -1,5 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
from waflib.extras import autowaf as autowaf
import os import os
def options(opt): def options(opt):
@ -22,6 +21,3 @@ def build(bld):
obj.uselib = 'GTKMM CWIID XML' obj.uselib = 'GTKMM CWIID XML'
obj.use = 'libardour libardour_cp libgtkmm2ext' obj.use = 'libardour libardour_cp libgtkmm2ext'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
def shutdown():
autowaf.shutdown()

View File

@ -95,6 +95,3 @@ def build(bld):
bld.recurse('maschine2') bld.recurse('maschine2')
if bld.is_defined ('HAVE_WEBSOCKETS'): if bld.is_defined ('HAVE_WEBSOCKETS'):
bld.recurse('websockets') bld.recurse('websockets')
def shutdown():
autowaf.shutdown()

View File

@ -106,6 +106,3 @@ def test(ctx):
os.environ['EVORAL_TEST_PATH'] = os.path.abspath('../test/testdata/') os.environ['EVORAL_TEST_PATH'] = os.path.abspath('../test/testdata/')
autowaf.run_tests(ctx, APPNAME, ['./run-tests']) autowaf.run_tests(ctx, APPNAME, ['./run-tests'])
autowaf.post_test(ctx, APPNAME) autowaf.post_test(ctx, APPNAME)
def shutdown():
autowaf.shutdown()

View File

@ -48,6 +48,3 @@ def build(bld):
obj.source += ' Onset.cpp ' obj.source += ' Onset.cpp '
obj.uselib += ' AUBIO ' obj.uselib += ' AUBIO '
obj.install_path = os.path.join(bld.env['LIBDIR'], 'vamp') obj.install_path = os.path.join(bld.env['LIBDIR'], 'vamp')
def shutdown():
autowaf.shutdown()

View File

@ -40,6 +40,3 @@ def build(bld):
autowaf.ensure_visible_symbols (obj, True) autowaf.ensure_visible_symbols (obj, True)
obj.vnum = VAMP_PYIN_LIB_VERSION obj.vnum = VAMP_PYIN_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'vamp') obj.install_path = os.path.join(bld.env['LIBDIR'], 'vamp')
def shutdown():
autowaf.shutdown()

View File

@ -47,6 +47,3 @@ def build(bld):
obj.vnum = WAVEVIEW_LIB_VERSION obj.vnum = WAVEVIEW_LIB_VERSION
obj.install_path = bld.env['LIBDIR'] obj.install_path = bld.env['LIBDIR']
obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ] obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
def shutdown():
autowaf.shutdown()

View File

@ -72,6 +72,3 @@ def build(bld):
obj.vnum = WIDGETS_LIB_VERSION obj.vnum = WIDGETS_LIB_VERSION
obj.install_path = bld.env['LIBDIR'] obj.install_path = bld.env['LIBDIR']
obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ] obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
def shutdown():
autowaf.shutdown()

View File

@ -31,6 +31,3 @@ def build(bld):
obj.vnum = ZCONVOLVER_LIB_VERSION obj.vnum = ZCONVOLVER_LIB_VERSION
obj.uselib = 'FFTW3F' obj.uselib = 'FFTW3F'
obj.defines = [ 'PACKAGE="' + I18N_PACKAGE + '"', 'ENABLE_VECTOR_MODE', '_POSIX_PTHREAD_SEMANTICS', '_REENTRANT' ] obj.defines = [ 'PACKAGE="' + I18N_PACKAGE + '"', 'ENABLE_VECTOR_MODE', '_POSIX_PTHREAD_SEMANTICS', '_REENTRANT' ]
def shutdown():
autowaf.shutdown()

View File

@ -1,5 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
from waflib.extras import autowaf as autowaf
# Version of this package (even if built as a child) # Version of this package (even if built as a child)
MAJOR = '1' MAJOR = '1'
@ -38,6 +37,3 @@ def build(bld):
obj.target = 'zita-resampler' obj.target = 'zita-resampler'
obj.vnum = ZRESAMPLER_LIB_VERSION obj.vnum = ZRESAMPLER_LIB_VERSION
obj.defines = [ 'PACKAGE="' + I18N_PACKAGE + '"' ] obj.defines = [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
def shutdown():
autowaf.shutdown()