X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fwscript;h=336274dcefbfd18221eff2d1561daee8d8738242;hb=ccebb050e417a6aea32811c1e1f06abaa3f85e86;hp=ee86a203193608f30077480a245f4a30ad68605c;hpb=162d672769f648f33e89c6f666cf927b32f5ef3f;p=ardour.git diff --git a/libs/ardour/wscript b/libs/ardour/wscript index ee86a20319..336274dcef 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -4,26 +4,14 @@ from waflib import Options import os import re import subprocess - -# Version of this package (even if built as a child) -MAJOR = '3' -MINOR = '0' -MICRO = '0' -LIBARDOUR_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO) - -# Library version (UNIX style major, minor, micro) -# major increment <=> incompatible changes -# minor increment <=> compatible changes (additions) -# micro increment <=> no interface changes -LIBARDOUR_LIB_VERSION = '3.0.0' +import sys # default state file version for this build CURRENT_SESSION_FILE_VERSION = 3001 # Variables for 'waf dist' APPNAME = 'libardour3' -VERSION = LIBARDOUR_VERSION -I18N_PACKAGE = 'libardour3' +I18N_PACKAGE = 'ardour3' # Mandatory variables top = '.' @@ -34,6 +22,7 @@ path_prefix = 'libs/ardour/' libardour_sources = [ 'amp.cc', 'analyser.cc', + 'async_midi_port.cc', 'audio_buffer.cc', 'audio_diskstream.cc', 'audio_library.cc', @@ -55,6 +44,8 @@ libardour_sources = [ 'automation.cc', 'automation_control.cc', 'automation_list.cc', + 'automation_watch.cc', + 'backend_search_path.cc', 'beats_frames_converter.cc', 'broadcast_info.cc', 'buffer.cc', @@ -62,7 +53,6 @@ libardour_sources = [ 'buffer_set.cc', 'bundle.cc', 'butler.cc', - 'callback.cc', 'capturing_processor.cc', 'chan_count.cc', 'chan_mapping.cc', @@ -79,6 +69,7 @@ libardour_sources = [ 'diskstream.cc', 'element_import_handler.cc', 'element_importer.cc', + 'engine_slave.cc', 'enums.cc', 'event_type_map.cc', 'export_channel.cc', @@ -104,16 +95,21 @@ libardour_sources = [ 'globals.cc', 'graph.cc', 'graphnode.cc', + 'iec1ppmdsp.cc', + 'iec2ppmdsp.cc', 'import.cc', + 'instrument_info.cc', 'internal_return.cc', 'internal_send.cc', 'interpolation.cc', 'io.cc', 'io_processor.cc', - 'jack_slave.cc', + 'kmeterdsp.cc', 'ladspa_plugin.cc', 'location.cc', 'location_importer.cc', + 'ltc_slave.cc', + 'lv2_bundled_search_path.cc', 'meter.cc', 'midi_automation_list_binder.cc', 'midi_buffer.cc', @@ -132,12 +128,12 @@ libardour_sources = [ 'midi_stretch.cc', 'midi_track.cc', 'midi_ui.cc', + 'midiport_manager.cc', 'mix.cc', 'monitor_processor.cc', 'mtc_slave.cc', 'mtdm.cc', 'mute_master.cc', - 'named_selection.cc', 'onset_detector.cc', 'operations.cc', 'pan_controllable.cc', @@ -156,6 +152,7 @@ libardour_sources = [ 'plugin_manager.cc', 'port.cc', 'port_insert.cc', + 'port_manager.cc', 'port_set.cc', 'process_thread.cc', 'processor.cc', @@ -183,6 +180,7 @@ libardour_sources = [ 'session_events.cc', 'session_export.cc', 'session_handle.cc', + 'session_ltc.cc', 'session_metadata.cc', 'session_midi.cc', 'session_object.cc', @@ -193,7 +191,6 @@ libardour_sources = [ 'session_state_utils.cc', 'session_time.cc', 'session_transport.cc', - 'session_utils.cc', 'slave.cc', 'smf_source.cc', 'sndfile_helpers.cc', @@ -203,7 +200,7 @@ libardour_sources = [ 'source_factory.cc', 'speakers.cc', 'strip_silence.cc', - 'svn_revision.cc', + 'revision.cc', 'tape_file_matcher.cc', 'template_utils.cc', 'tempo.cc', @@ -216,7 +213,8 @@ libardour_sources = [ 'user_bundle.cc', 'utils.cc', 'version.cc', - 'worker.cc', + 'vumeterdsp.cc', + 'worker.cc' ] def flac_supported(): @@ -239,15 +237,15 @@ def options(opt): def configure(conf): conf.load('compiler_cxx') conf.load('gas') + # we don't use hard-coded micro versions with ardour, so hard code it to zero autowaf.build_version_files( path_prefix + 'ardour/version.h', path_prefix + 'version.cc', - 'libardour3', MAJOR, MINOR, MICRO) + 'libardour3', conf.env['MAJOR'], conf.env['MINOR'], 0, + 'LIBARDOUR_API', 'ardour/libardour_visibility.h') autowaf.configure(conf) autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', atleast_version='0.3.2') - autowaf.check_pkg(conf, 'jack', uselib_store='JACK', - atleast_version='0.118.2') autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML') autowaf.check_pkg(conf, 'lrdf', uselib_store='LRDF', atleast_version='0.4.0') @@ -255,9 +253,15 @@ def configure(conf): atleast_version='0.1.0') autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0') + + if re.search ("linux", sys.platform) != None: + autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA') + if Options.options.lv2: autowaf.check_pkg(conf, 'lv2', uselib_store='LV2', atleast_version='1.0.0', mandatory=True) + autowaf.check_pkg(conf, 'lv2', uselib_store='NEW_LV2', + atleast_version='1.0.15', mandatory=False) autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD', atleast_version='0.14.0', mandatory=True) autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD', @@ -266,6 +270,8 @@ def configure(conf): atleast_version='0.2.0', mandatory=True) autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV', atleast_version='0.14.0', mandatory=True) + autowaf.check_pkg(conf, 'lilv-0', uselib_store='NEW_LILV', + atleast_version='0.15.0', mandatory=False) autowaf.check_pkg(conf, 'suil-0', uselib_store='SUIL', atleast_version='0.6.0', mandatory=False) conf.define ('LV2_SUPPORT', 1) @@ -288,53 +294,10 @@ def configure(conf): conf.define('CURRENT_SESSION_FILE_VERSION', CURRENT_SESSION_FILE_VERSION) conf.check(header_name='sys/vfs.h', define_name='HAVE_SYS_VFS_H',mandatory=False) - - conf.check(header_name='jack/session.h', uselib = [ 'JACK' ], - define_name='HAVE_JACK_SESSION') + conf.check(header_name='sys/statvfs.h', define_name='HAVE_SYS_STATVFS_H',mandatory=False) conf.check(header_name='unistd.h', define_name='HAVE_UNISTD',mandatory=False) - conf.check_cc(fragment = ''' -#include -void callback(jack_status_t code, const char* reason, void* arg) { return; } -int main(int argc, char **argv) { - jack_client_t* c; - jack_on_info_shutdown(c, callback, (void*) 0); - return 0; -}''', - uselib= [ 'JACK' ], - msg = 'Checking for jack_on_info_shutdown', - define_name = 'HAVE_JACK_ON_INFO_SHUTDOWN', - okmsg = 'present') - - missing_jack_message = 'missing - a version of JACK that supports jack_port_set_latency_range() is required to compile Ardour3.' - - conf.check_cc(fragment = ''' -#include -int main(int argc, char **argv) { - jack_port_t* p; - jack_latency_range_t r; - jack_port_set_latency_range(p, JackCaptureLatency, &r); - return 0; -}''', - uselib = [ 'JACK' ], - msg = 'Checking for new JACK latency API', - okmsg = 'present', - mandatory = True, - errmsg = missing_jack_message) - - conf.check_cc(fragment = ''' -#include -int main(int argc, char **argv) { - jack_port_type_get_buffer_size((jack_client_t*)0, ""); - return 0; -}''', - uselib = [ 'JACK' ], - msg = 'Checking for new jack_port_type_get_buffer_size', - okmsg = 'present', - mandatory = True, - errmsg = missing_jack_message) - if flac_supported(): conf.define ('HAVE_FLAC', 1) if ogg_supported(): @@ -350,27 +313,52 @@ int main(int argc, char **argv) { def build(bld): + # Library version (UNIX style major, minor, micro) + # major increment <=> incompatible changes + # minor increment <=> compatible changes (additions) + # micro increment <=> no interface changes + LIBARDOUR_LIB_VERSION = "3.0.0" + # Library - obj = bld(features = 'c cxx cshlib cxxshlib') - obj.source = libardour_sources + if bld.is_defined ('INTERNAL_SHARED_LIBS'): + obj = bld.shlib(features = 'c cxx cshlib cxxshlib', source=libardour_sources) + # macros for this shared library + obj.defines = [ 'LIBARDOUR_DLL_EXPORTS=1' ] + obj.cflags = [ '-fvisibility=hidden' ] + obj.cxxflags = [ '-fvisibility=hidden' ] + else: + obj = bld.stlib(features = 'c cxx cstlib cxxstlib', source=libardour_sources) + obj.cxxflags = [ '-fPIC' ] + obj.cflags = [ '-fPIC' ] + obj.defines = [] + obj.export_includes = ['.'] obj.includes = ['.', '../surfaces/control_protocol', '..'] - obj.name = 'libardour' + obj.name = 'ardour' obj.target = 'ardour' obj.uselib = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID', - 'JACK','SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS', + 'SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS', 'OSX','BOOST','CURL','DL'] - obj.use = ['libpbd','libmidipp','libevoral','libvamphost', - 'libvampplugin','libtaglib','librubberband', - 'libaudiographer'] + obj.use = ['libpbd','libmidipp','libevoral', 'libvampplugin', + 'libaudiographer', + 'libtimecode_includes', + ] + if bld.is_defined('USE_EXTERNAL_LIBS'): + obj.uselib.extend(['RUBBERBAND', 'TAGLIB', 'VAMPSDK', 'LIBLTC', + 'VAMPHOSTSDK']) + else: + obj.use.extend(['librubberband', 'libtaglib', 'libvamphost' + 'libltc_includes', 'libltc']) + obj.vnum = LIBARDOUR_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - obj.defines = [ + obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', 'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"', - 'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"' + 'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"', + 'EVORAL_MIDI_XML=1', ] #obj.source += ' st_stretch.cc st_pitch.cc ' @@ -419,40 +407,21 @@ def build(bld): if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'): # Unit tests - testobj = bld(features = 'cxx cxxprogram') - testobj.source = ''' - test/dummy_lxvst.cc - test/test_needing_session.cc - test/test_needing_playlist_and_regions.cc - test/test_globals.cc - test/audio_region_test.cc - test/bbt_test.cc - test/tempo_test.cc - test/interpolation_test.cc - test/midi_clock_slave_test.cc - test/resampled_source_test.cc - test/framewalk_to_beats_test.cc - test/framepos_plus_beats_test.cc - test/framepos_minus_beats_test.cc - test/playlist_layering_test.cc - test/playlist_read_test.cc - test/control_surfaces_test.cc - test/mtdm_test.cc - test/testrunner.cc - '''.split() - -# Tests that don't work -# test/mantis_3356_test.cc - - testobj.includes = obj.includes + ['test', '../pbd'] - testobj.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD', - 'SAMPLERATE','XML','LRDF','COREAUDIO'] - testobj.use = ['libpbd','libmidipp','libardour'] - testobj.name = 'libardour-tests' - testobj.target = 'run-tests' - testobj.install_path = '' - testobj.defines = [ - 'PACKAGE="libardour3test"', + # only build these common sources once + testcommon = bld(features = 'cxx') + testcommon.includes = obj.includes + ['test', '../pbd', '..'] + testcommon.source = ['test/testrunner.cc', 'test/test_needing_session.cc', + 'test/test_common.cc', 'test/dummy_lxvst.cc', 'test/audio_region_test.cc', 'test/test_util.cc'] + testcommon.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD', + 'SAMPLERATE','XML','LRDF','COREAUDIO'] + testcommon.use = ['libpbd','libmidipp','libevoral', + 'libvampplugin','libaudiographer','ardour'] + if bld.is_defined('USE_EXTERNAL_LIBS'): + testcommon.uselib.extend(['RUBBERBAND', 'TAGLIB', 'LIBLTC', 'VAMPSDK', + 'VAMPHOSTSDK']) + else: + testcommon.use.extend(['libltc', 'librubberband', 'libtaglib', 'libvamphost']) + testcommon.defines = [ 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', 'LOCALEDIR="' + os.path.join( @@ -460,29 +429,76 @@ def build(bld): 'VAMP_DIR="' + os.path.join( os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"' ] + testcommon.name = 'testcommon' + if bld.env['FPU_OPTIMIZATION']: - testobj.source += [ 'sse_functions_xmm.cc' ] + testcommon.source += [ 'sse_functions_xmm.cc' ] if (bld.env['build_target'] == 'i386' or bld.env['build_target'] == 'i686'): - testobj.source += [ 'sse_functions.s' ] + testcommon.source += [ 'sse_functions.s' ] elif bld.env['build_target'] == 'x86_64': - testobj.source += [ 'sse_functions_64bit.s' ] - - # Profiling - profilingobj = bld(features = 'cxx cxxprogram') - profilingobj.source = ''' - test/dummy_lxvst.cc - test/profiling/runpc.cc + testcommon.source += [ 'sse_functions_64bit.s' ] + + if bld.env['SINGLE_TESTS']: + create_ardour_test_program(bld, obj.includes, 'automation_list_property_test', 'test_automation_list_property', ['test/automation_list_property_test.cc']) + create_ardour_test_program(bld, obj.includes, 'bbt', 'test_bbt', ['test/bbt_test.cc']) + create_ardour_test_program(bld, obj.includes, 'tempo', 'test_tempo', ['test/tempo_test.cc']) + create_ardour_test_program(bld, obj.includes, 'interpolation', 'test_interpolation', ['test/interpolation_test.cc']) + create_ardour_test_program(bld, obj.includes, 'midi_clock_slave', 'test_midi_clock_slave', ['test/midi_clock_slave_test.cc']) + create_ardour_test_program(bld, obj.includes, 'resampled_source', 'test_resampled_source', ['test/resampled_source_test.cc']) + create_ardour_test_program(bld, obj.includes, 'framewalk_to_beats', 'test_framewalk_to_beats', ['test/framewalk_to_beats_test.cc']) + create_ardour_test_program(bld, obj.includes, 'framepos_plus_beats', 'test_framepos_plus_beats', ['test/framepos_plus_beats_test.cc']) + create_ardour_test_program(bld, obj.includes, 'framepos_minus_beats', 'test_framepos_minus_beats', ['test/framepos_minus_beats_test.cc']) + create_ardour_test_program(bld, obj.includes, 'playlist_equivalent_regions', 'test_playlist_equivalent_regions', ['test/playlist_equivalent_regions_test.cc']) + create_ardour_test_program(bld, obj.includes, 'playlist_layering', 'test_playlist_layering', ['test/playlist_layering_test.cc']) + create_ardour_test_program(bld, obj.includes, 'region_naming', 'test_region_naming', ['test/region_naming_test.cc']) + create_ardour_test_program(bld, obj.includes, 'control_surface', 'test_control_surfaces', ['test/control_surfaces_test.cc']) + create_ardour_test_program(bld, obj.includes, 'mtdm_test', 'test_mtdm', ['test/mtdm_test.cc']) + create_ardour_test_program(bld, obj.includes, 'session_test', 'test_session', ['test/session_test.cc']) + + test_sources = ''' + test/automation_list_property_test.cc + test/bbt_test.cc + test/tempo_test.cc + test/interpolation_test.cc + test/midi_clock_slave_test.cc + test/resampled_source_test.cc + test/framewalk_to_beats_test.cc + test/framepos_plus_beats_test.cc + test/framepos_minus_beats_test.cc + test/playlist_equivalent_regions_test.cc + test/playlist_layering_test.cc + test/region_naming_test.cc + test/control_surfaces_test.cc + test/mtdm_test.cc + test/session_test.cc '''.split() - profilingobj.includes = obj.includes - profilingobj.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD', +# Tests that don't work +# test/playlist_read_test.cc +# test/audio_region_read_test.cc +# test/combine_regions_test.cc +# test/mantis_3356_test.cc + + create_ardour_test_program(bld, obj.includes, 'libardour-tests', 'run-tests', test_sources) + + # Tester to just load a session + session_load_tester = bld(features = 'cxx cxxprogram') + session_load_tester.source = ''' + test/test_util.cc + test/load_session.cc + test/dummy_lxvst.cc + '''.split() + + session_load_tester.includes = obj.includes + session_load_tester.includes.append ('test') + session_load_tester.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD', 'SAMPLERATE','XML','LRDF','COREAUDIO'] - profilingobj.use = ['libpbd','libmidipp','libardour'] - profilingobj.name = 'libardour-profiling' - profilingobj.target = 'run-profiling' - profilingobj.install_path = '' - profilingobj.defines = [ + session_load_tester.use = ['libpbd','libmidipp','ardour'] + session_load_tester.name = 'libardour-session-load-tester' + session_load_tester.target = 'load-session' + session_load_tester.install_path = '' + session_load_tester.defines = [ 'PACKAGE="libardour3profile"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', @@ -492,12 +508,76 @@ def build(bld): os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"' ] if bld.env['FPU_OPTIMIZATION']: - profilingobj.source += [ 'sse_functions_xmm.cc' ] + session_load_tester.source += [ 'sse_functions_xmm.cc' ] if (bld.env['build_target'] == 'i386' or bld.env['build_target'] == 'i686'): - profilingobj.source += [ 'sse_functions.s' ] + session_load_tester.source += [ 'sse_functions.s' ] elif bld.env['build_target'] == 'x86_64': - profilingobj.source += [ 'sse_functions_64bit.s' ] + session_load_tester.source += [ 'sse_functions_64bit.s' ] + + # Profiling + for p in ['runpc', 'lots_of_regions', 'load_session']: + profilingobj = bld(features = 'cxx cxxprogram') + profilingobj.source = ''' + test/dummy_lxvst.cc + test/test_util.cc + '''.split() + + profilingobj.source.append('test/profiling/%s.cc' % p) + + profilingobj.includes = obj.includes + profilingobj.includes.append ('test') + profilingobj.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD', + 'SAMPLERATE','XML','LRDF','COREAUDIO'] + profilingobj.use = ['libpbd','libmidipp','ardour'] + profilingobj.name = 'libardour-profiling' + profilingobj.target = p + profilingobj.install_path = '' + profilingobj.defines = [ + 'PACKAGE="libardour3profile"', + 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', + 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', + 'LOCALEDIR="' + os.path.join( + os.path.normpath(bld.env['DATADIR']), 'locale') + '"', + 'VAMP_DIR="' + os.path.join( + os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"' + ] + if bld.env['FPU_OPTIMIZATION']: + profilingobj.source += [ 'sse_functions_xmm.cc' ] + if (bld.env['build_target'] == 'i386' + or bld.env['build_target'] == 'i686'): + profilingobj.source += [ 'sse_functions.s' ] + elif bld.env['build_target'] == 'x86_64': + profilingobj.source += [ 'sse_functions_64bit.s' ] + +def create_ardour_test_program(bld, includes, name, target, sources): + testobj = bld(features = 'cxx cxxprogram') + testobj.includes = includes + ['test', '../pbd', '..'] + testobj.source = sources + testobj.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD', + 'SAMPLERATE','XML','LRDF','COREAUDIO'] + testobj.use = ['libpbd','libmidipp','libevoral','libvampplugin', + 'libaudiographer','ardour','testcommon'] + if bld.is_defined('USE_EXTERNAL_LIBS'): + testobj.uselib.extend(['RUBBERBAND', 'TAGLIB', 'LIBLTC', 'VAMPSDK', + 'VAMPHOSTSDK']) + else: + testobj.use.extend(['libltc', 'librubberband', 'libtaglib', + 'libvamphost']) + + testobj.name = name + testobj.target = target + # not sure about install path + testobj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') + testobj.defines = [ + 'PACKAGE="libardour3test"', + 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', + 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', + 'LOCALEDIR="' + os.path.join( + os.path.normpath(bld.env['DATADIR']), 'locale') + '"', + 'VAMP_DIR="' + os.path.join( + os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"' + ] def shutdown(): autowaf.shutdown()