X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=4604b1d4bf3f6cbe1077ceaecc8463303a5cbd7b;hb=052a0785b5c2d2d90fc7d2eca1babe09aa526f14;hp=b21406b36033e3d46bfc679343df0199de259331;hpb=eb91adc959c0b59c66a8826bb4d489c7b6c1fd93;p=ardour.git diff --git a/wscript b/wscript index b21406b360..4604b1d4bf 100644 --- a/wscript +++ b/wscript @@ -8,8 +8,8 @@ import subprocess import sys # Variables for 'waf dist' -VERSION = '3.0alpha10' -APPNAME = 'Ardour' +VERSION = '3.0beta2' +APPNAME = 'Ardour3' # Mandatory variables top = '.' @@ -34,6 +34,8 @@ children = [ 'gtk2_ardour', 'templates', 'export', + 'midi_maps', + 'manual' ] i18n_children = [ @@ -44,8 +46,10 @@ i18n_children = [ if sys.platform != 'darwin': children += [ 'tools/sanity_check' ] + lxvst_default = True else: children += [ 'libs/appleutility' ] + lxvst_default = False # Version stuff @@ -179,7 +183,8 @@ def set_compiler_flags (conf,opt): # # ARCH_X86 means anything in the x86 family from i386 to x86_64 - # USE_X86_64_ASM is used to distingush 32 and 64 bit assembler + # the compile-time presence of the macro _LP64 is used to + # distingush 32 and 64 bit assembler # if (re.search ("(i[0-9]86|x86_64)", config[config_cpu]) != None): @@ -224,16 +229,13 @@ def set_compiler_flags (conf,opt): elif conf.env['build_target'] == 'i686' or conf.env['build_target'] == 'x86_64': optimization_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") debug_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") - elif conf.env['build_target'] == 'x86_64': - optimization_flags.append ("-DUSE_X86_64_ASM") - debug_flags.append ("-DUSE_X86_64_ASM") if not build_host_supports_sse: print("\nWarning: you are building Ardour with SSE support even though your system does not support these instructions. (This may not be an error, especially if you are a package maintainer)") # check this even if we aren't using FPU optimization if not conf.is_defined('HAVE_POSIX_MEMALIGN'): optimization_flags.append("-DNO_POSIX_MEMALIGN") - debug_flags.append("-DNO_POSIX_MEMALIGN") + debug_flags.append("-DNO_POSIX_MEMALIGN") # end optimization section @@ -241,18 +243,15 @@ def set_compiler_flags (conf,opt): # no VST on x86_64 # - if conf.env['build_target'] == 'x86_64' and opt.vst: + if conf.env['build_target'] == 'x86_64' and opt.windows_vst: print("\n\n==================================================") - print("You cannot use VST plugins with a 64 bit host. Please run waf with --vst=0") + print("You cannot use VST plugins with a 64 bit host. Please run waf with --windows-vst=0") print("\nIt is theoretically possible to build a 32 bit host on a 64 bit system.") print("However, this is tricky and not recommended for beginners.") sys.exit (-1) if opt.lxvst: if conf.env['build_target'] == 'x86_64': - print("\n\n********************************************************") - print("* Building with 64Bit linuxVST support is experimental *") - print("********************************************************\n\n") conf.env.append_value('CXXFLAGS', "-DLXVST_64BIT") else: conf.env.append_value('CXXFLAGS', "-DLXVST_32BIT") @@ -311,10 +310,19 @@ def set_compiler_flags (conf,opt): conf.env.append_value('CXXFLAGS', '-DDEBUG_RT_ALLOC') conf.env.append_value('LINKFLAGS', '-ldl') + if conf.env['DEBUG_DENORMAL_EXCEPTION']: + conf.env.append_value('CFLAGS', '-DDEBUG_DENORMAL_EXCEPTION') + conf.env.append_value('CXXFLAGS', '-DDEBUG_DENORMAL_EXCEPTION') + if opt.universal: - conf.env.append_value('CFLAGS', "-arch i386 -arch ppc") - conf.env.append_value('CXXFLAGS', "-arch i386 -arch ppc") - conf.env.append_value('LINKFLAGS', "-arch i386 -arch ppc") + if not Options.options.nocarbon: + conf.env.append_value('CFLAGS', ["-arch", "i386", "-arch", "ppc"]) + conf.env.append_value('CXXFLAGS', ["-arch", "i386", "-arch", "ppc"]) + conf.env.append_value('LINKFLAGS', ["-arch", "i386", "-arch", "ppc"]) + else: + conf.env.append_value('CFLAGS', ["-arch", "x86_64", "-arch", "i386", "-arch", "ppc"]) + conf.env.append_value('CXXFLAGS', ["-arch", "x86_64", "-arch", "i386", "-arch", "ppc"]) + conf.env.append_value('LINKFLAGS', ["-arch", "x86_64", "-arch", "i386", "-arch", "ppc"]) # # warnings flags @@ -323,11 +331,6 @@ def set_compiler_flags (conf,opt): conf.env.append_value('CFLAGS', "-Wall") conf.env.append_value('CXXFLAGS', [ '-Wall', '-Woverloaded-virtual']) - if opt.extra_warn: - flags = [ '-Wextra' ] - conf.env.append_value('CFLAGS', flags) - conf.env.append_value('CXXFLAGS', flags) - # # more boilerplate @@ -352,39 +355,46 @@ def set_compiler_flags (conf,opt): def options(opt): opt.load('compiler_c') opt.load('compiler_cxx') - autowaf.set_options(opt) + autowaf.set_options(opt, debug_by_default=True) opt.add_option('--program-name', type='string', action='store', default='Ardour', dest='program_name', help='The user-visible name of the program being built') opt.add_option('--arch', type='string', action='store', dest='arch', help='Architecture-specific compiler flags') + opt.add_option('--no-carbon', action='store_true', default=False, dest='nocarbon', + help='Compile without support for AU Plugins with only CARBON UI (needed for 64bit)') opt.add_option('--boost-sp-debug', action='store_true', default=False, dest='boost_sp_debug', help='Compile with Boost shared pointer debugging') opt.add_option('--dist-target', type='string', default='auto', dest='dist_target', help='Specify the target for cross-compiling [auto,none,x86,i386,i686,x86_64,powerpc,tiger,leopard]') - opt.add_option('--extra-warn', action='store_true', default=False, dest='extra_warn', - help='Build with even more compiler warning flags') opt.add_option('--fpu-optimization', action='store_true', default=True, dest='fpu_optimization', help='Build runtime checked assembler code (default)') opt.add_option('--no-fpu-optimization', action='store_false', dest='fpu_optimization') opt.add_option('--freedesktop', action='store_true', default=False, dest='freedesktop', help='Install MIME type, icons and .desktop file as per freedesktop.org standards') - opt.add_option('--freesound', action='store_true', default=False, dest='freesound', - help='Include Freesound database lookup') + opt.add_option('--freebie', action='store_true', default=False, dest='freebie', + help='Build a version suitable for distribution as a zero-cost binary') + opt.add_option('--no-freesound', action='store_false', default=True, dest='freesound', + help='Do not build with Freesound database support') opt.add_option('--gprofile', action='store_true', default=False, dest='gprofile', help='Compile for use with gprofile') - opt.add_option('--lv2', action='store_true', default=False, dest='lv2', + opt.add_option('--lv2', action='store_true', default=True, dest='lv2', help='Compile with support for LV2 (if Lilv+Suil is available)') - opt.add_option('--lxvst', action='store_true', default=True, dest='lxvst', + opt.add_option('--no-lv2', action='store_false', dest='lv2', + help='Do not compile with support for LV2') + opt.add_option('--lxvst', action='store_true', default=lxvst_default, dest='lxvst', help='Compile with support for linuxVST plugins') opt.add_option('--nls', action='store_true', default=True, dest='nls', help='Enable i18n (native language support) (default)') opt.add_option('--no-nls', action='store_false', dest='nls') - opt.add_option('--optimize', action='store_false', dest='debug') opt.add_option('--phone-home', action='store_false', default=False, dest='phone_home') opt.add_option('--stl-debug', action='store_true', default=False, dest='stl_debug', help='Build with debugging for the STL') opt.add_option('--rt-alloc-debug', action='store_true', default=False, dest='rt_alloc_debug', help='Build with debugging for memory allocation in the real-time thread') + opt.add_option('--pt-timing', action='store_true', default=False, dest='pt_timing', + help='Build with logging of timing in the process thread(s)') + opt.add_option('--denormal-exception', action='store_true', default=False, dest='denormal_exception', + help='Raise a floating point exception if a denormal is detected') opt.add_option('--test', action='store_true', default=False, dest='build_tests', help="Build unit tests") opt.add_option('--tranzport', action='store_true', default=False, dest='tranzport', @@ -393,8 +403,8 @@ def options(opt): help='Compile as universal binary (requires that external libraries are universal)') opt.add_option('--versioned', action='store_true', default=False, dest='versioned', help='Add revision information to executable name inside the build directory') - opt.add_option('--vst', action='store_true', default=False, dest='vst', - help='Compile with support for VST') + opt.add_option('--windows-vst', action='store_true', default=False, dest='windows_vst', + help='Compile with support for Windows VST') opt.add_option('--wiimote', action='store_true', default=False, dest='wiimote', help='Build the wiimote control surface') opt.add_option('--windows-key', type='string', action='store', dest='windows_key', default='Mod4><\'') opt.add_option('--boost-include', type='string', action='store', dest='boost_include', default='', help='directory where Boost header files can be found') + opt.add_option('--also-include', type='string', action='store', dest='also_include', default='', + help='additional include directory where header files can be found') opt.add_option('--wine-include', type='string', action='store', dest='wine_include', default='/usr/include/wine/windows', help='directory where Wine\'s Windows header files can be found') opt.add_option('--noconfirm', action='store_true', default=False, dest='noconfirm', @@ -417,7 +429,7 @@ def configure(conf): conf.load('compiler_c') conf.load('compiler_cxx') if not Options.options.noconfirm: - print ('\n\nThis is an alpha version of Ardour 3.0.\n\n' + + print ('\n\nThis is a beta version of Ardour 3.0.\n\n' + 'You are respectfully requested NOT to ask for assistance with build issues\n' + 'and not to report issues with Ardour 3.0 on the forums at ardour.org.\n\n' + 'Please use IRC, the bug tracker and/or the ardour mailing lists (-dev or -user)\n\n' + @@ -439,9 +451,16 @@ def configure(conf): if sys.platform == 'darwin': + # this is required, potentially, for anything we link and then relocate into a bundle + conf.env.append_value('LINKFLAGS', [ '-Xlinker', '-headerpad', '-Xlinker', '2048']) + conf.define ('HAVE_COREAUDIO', 1) conf.define ('AUDIOUNIT_SUPPORT', 1) - conf.define ('AU_STATE_SUPPORT', 1) + if not Options.options.nocarbon: + conf.define ('WITH_CARBON', 1) + if not Options.options.freebie: + conf.define ('AU_STATE_SUPPORT', 1) + conf.define ('GTKOSX', 1) conf.define ('TOP_MENUBAR',1) conf.define ('GTKOSX',1) @@ -476,21 +495,29 @@ def configure(conf): conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'AppKit']) conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'CoreAudio']) + conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'CoreAudioKit']) conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'CoreFoundation']) conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'CoreServices']) - conf.env.append_value('LINKFLAGS_OSX', ['-undefined', 'suppress' ]) - conf.env.append_value('LINKFLAGS_OSX', '-flat_namespace') - - conf.env.append_value('LINKFLAGS_GTKOSX', [ '-Xlinker', '-headerpad']) - conf.env.append_value('LINKFLAGS_GTKOSX', ['-Xlinker', '2048']) + conf.env.append_value('LINKFLAGS_OSX', ['-undefined', 'dynamic_lookup' ]) + conf.env.append_value('LINKFLAGS_OSX', ['-flat_namespace']) conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DAUDIOUNIT_SUPPORT") - conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DAU_STATE_SUPPORT") conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Audiotoolbox', '-framework', 'AudioUnit']) + conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Cocoa']) + + if not Options.options.freebie: + conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DAU_STATE_SUPPORT") + if not Options.options.nocarbon: + conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DWITH_CARBON") + conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Carbon']) if Options.options.boost_include != '': - conf.env.append_value('CPPPATH', Options.options.boost_include) + conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include) + + if Options.options.also_include != '': + conf.env.append_value('CXXFLAGS', '-I' + Options.options.also_include) + conf.env.append_value('CFLAGS', '-I' + Options.options.also_include) autowaf.check_header(conf, 'cxx', 'boost/signals2.hpp', mandatory = True) @@ -511,6 +538,7 @@ def configure(conf): autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.2') autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.14.0') autowaf.check_pkg(conf, 'sndfile', uselib_store='SNDFILE', atleast_version='1.0.18') + autowaf.check_pkg(conf, 'giomm-2.4', uselib_store='GIOMM', atleast_version='2.2') for i in children: sub_config_and_use(conf, i) @@ -544,10 +572,11 @@ def configure(conf): conf.env['BUILD_TESTS'] = opts.build_tests if opts.tranzport: conf.env['TRANZPORT'] = 1 - if opts.vst: - conf.define('VST_SUPPORT', 1) - conf.env['VST_SUPPORT'] = True - conf.env.append_value('CPPPATH', Options.options.wine_include) + if opts.windows_vst: + conf.define('WINDOWS_VST_SUPPORT', 1) + conf.env['WINDOWS_VST_SUPPORT'] = True + conf.env.append_value('CFLAGS', '-I' + Options.options.wine_include) + conf.env.append_value('CXXFLAGS', '-I' + Options.options.wine_include) autowaf.check_header(conf, 'cxx', 'windows.h', mandatory = True) if opts.lxvst: conf.define('LXVST_SUPPORT', 1) @@ -561,6 +590,13 @@ def configure(conf): conf.env['PROGRAM_NAME'] = opts.program_name if opts.rt_alloc_debug: conf.define('DEBUG_RT_ALLOC', 1) + conf.env['DEBUG_RT_ALLOC'] = True + if opts.pt_timing: + conf.define('PT_TIMING', 1) + conf.env['PT_TIMING'] = True + if opts.denormal_exception: + conf.define('DEBUG_DENORMAL_EXCEPTION', 1) + conf.env['DEBUG_DENORMAL_EXCEPTION'] = True if not conf.is_defined('HAVE_CPPUNIT'): conf.env['BUILD_TESTS'] = False @@ -589,6 +625,9 @@ const char* const ardour_config_info = "\\n\\ write_config_text('AU state support', conf.is_defined('AU_STATE_SUPPORT')) write_config_text('Build target', conf.env['build_target']) write_config_text('CoreAudio', conf.is_defined('HAVE_COREAUDIO')) + write_config_text('Debug RT allocations', conf.is_defined('DEBUG_RT_ALLOC')) + write_config_text('Process thread timing', conf.is_defined('PT_TIMING')) + write_config_text('Denormal exceptions', conf.is_defined('DEBUG_DENORMAL_EXCEPTION')) write_config_text('FLAC', conf.is_defined('HAVE_FLAC')) write_config_text('FPU optimization', opts.fpu_optimization) write_config_text('Freedesktop files', opts.freedesktop) @@ -602,12 +641,12 @@ const char* const ardour_config_info = "\\n\\ write_config_text('Program name', opts.program_name) write_config_text('Rubberband', conf.is_defined('HAVE_RUBBERBAND')) write_config_text('Samplerate', conf.is_defined('HAVE_SAMPLERATE')) - write_config_text('Soundtouch', conf.is_defined('HAVE_SOUNDTOUCH')) +# write_config_text('Soundtouch', conf.is_defined('HAVE_SOUNDTOUCH')) write_config_text('Translation', opts.nls) write_config_text('Tranzport', opts.tranzport) - write_config_text('Unit tests', conf.is_defined('BUILD_TESTS')) + write_config_text('Unit tests', conf.env['BUILD_TESTS']) write_config_text('Universal binary', opts.universal) - write_config_text('VST support', opts.vst) + write_config_text('Windows VST support', opts.windows_vst) write_config_text('Wiimote support', opts.wiimote) write_config_text('Windows key', opts.windows_key) @@ -661,3 +700,12 @@ def build(bld): def i18n(bld): bld.recurse (i18n_children) + +def i18n_pot(bld): + bld.recurse (i18n_children) + +def i18n_po(bld): + bld.recurse (i18n_children) + +def i18n_mo(bld): + bld.recurse (i18n_children)