wscript: consistently have at most one empty separator line

This commit is contained in:
Mads Kiilerich 2022-04-09 11:55:09 +02:00
parent bac32a8c2d
commit 49855e52aa
15 changed files with 0 additions and 24 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -161,6 +161,5 @@ def build(bld):
manual_testobj.target = target
manual_testobj.install_path = ''
def shutdown():
autowaf.shutdown()

View File

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

View File

@ -26,7 +26,6 @@ out = 'build'
path_prefix = 'libs/midi++2/'
libmidi_sources = [
'midi.cc',
'channel.cc',

View File

@ -7,7 +7,6 @@ import os
top = '.'
out = 'build'
def options(opt):
autowaf.set_options(opt)

View File

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

View File

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

View File

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

View File

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

View File

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