X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=1252096bda0c4d0567984ea6d9c86e2f9790d7b4;hb=5ea6b4420b4dd9c499153bd97fc7d3271f45c5d3;hp=3dd87451e454fedde3c7fc43b554279728a19506;hpb=027f0e156a4ed764b4a507b8bf81e0764ec0b6d2;p=ardour.git diff --git a/wscript b/wscript index 3dd87451e4..1252096bda 100644 --- a/wscript +++ b/wscript @@ -7,18 +7,11 @@ import string import subprocess import sys -# -# build scripts need to find the right platform specific version -# +MAJOR = '3' +MINOR = '5' +VERSION = MAJOR + '.' + MINOR -if sys.platform == 'darwin': - OSX_VERSION = '3.0beta6' - VERSION = '3.0beta6' -else: - LINUX_VERSION = '3.0' - VERSION = '3.0' - -APPNAME = 'Ardour3' +APPNAME = 'Ardour' + MAJOR # Mandatory variables top = '.' @@ -36,13 +29,15 @@ children = [ 'libs/rubberband', 'libs/surfaces', 'libs/panners', + 'libs/backends', 'libs/timecode', 'libs/ardour', 'libs/gtkmm2ext', 'libs/clearlooks-newer', 'libs/audiographer', + 'libs/canvas', + 'libs/plugins/reasonablesynth.lv2', 'gtk2_ardour', - 'templates', 'export', 'midi_maps', 'mcp', @@ -74,7 +69,7 @@ def fetch_gcc_version (CC): return version def fetch_git_revision (): - cmd = "LANG= git describe --tags HEAD" + cmd = "git describe HEAD" output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines() rev = output[0].decode('utf-8') return rev @@ -116,12 +111,30 @@ def set_compiler_flags (conf,opt): platform = u[0].lower() version = u[2] + # waf adds -O0 -g itself. thanks waf! is_clang = conf.env['CXX'][0].endswith('clang++') + + if conf.options.cxx11: + conf.check_cxx(cxxflags=["-std=c++11"]) + conf.env.append_unique('CXXFLAGS', ['-std=c++11']) + if platform == "darwin": + conf.env.append_unique('CXXFLAGS', ['-stdlib=libc++']) + conf.env.append_unique('LINKFLAGS', ['-lc++']) + # Prevents visibility issues in standard headers + conf.define("_DARWIN_C_SOURCE", 1) + + if is_clang and platform == "darwin": + # Silence warnings about the non-existing osx clang compiler flags + # -compatibility_version and -current_version. These are Waf + # generated and not needed with clang + conf.env.append_unique ("CXXFLAGS", ["-Qunused-arguments"]) + if opt.gprofile: debug_flags = [ '-pg' ] - else: + + if opt.backtrace: if platform != 'darwin' and not is_clang: - debug_flags = [ '-rdynamic' ] # waf adds -O0 -g itself. thanks waf! + debug_flags = [ '-rdynamic' ] # Autodetect if opt.dist_target == 'auto': @@ -146,6 +159,8 @@ def set_compiler_flags (conf,opt): conf.env['build_target'] = 'i386' elif re.search("powerpc", cpu) != None: conf.env['build_target'] = 'powerpc' + elif re.search("arm", cpu) != None: + conf.env['build_target'] = 'arm' else: conf.env['build_target'] = 'i686' else: @@ -363,13 +378,19 @@ def set_compiler_flags (conf,opt): conf.env.append_value('CFLAGS', '-DBOOST_SYSTEM_NO_DEPRECATED') conf.env.append_value('CXXFLAGS', '-DBOOST_SYSTEM_NO_DEPRECATED') + # need ISOC9X for llabs() + conf.env.append_value('CFLAGS', '-D_ISOC9X_SOURCE') conf.env.append_value('CFLAGS', '-D_LARGEFILE64_SOURCE') conf.env.append_value('CFLAGS', '-D_FILE_OFFSET_BITS=64') + # need ISOC9X for llabs() + conf.env.append_value('CXXFLAGS', '-D_ISOC9X_SOURCE') conf.env.append_value('CXXFLAGS', '-D_LARGEFILE64_SOURCE') conf.env.append_value('CXXFLAGS', '-D_FILE_OFFSET_BITS=64') conf.env.append_value('CXXFLAGS', '-D__STDC_LIMIT_MACROS') conf.env.append_value('CXXFLAGS', '-D__STDC_FORMAT_MACROS') + conf.env.append_value('CXXFLAGS', '-DCANVAS_COMPATIBILITY') + conf.env.append_value('CXXFLAGS', '-DCANVAS_DEBUG') if opt.nls: conf.env.append_value('CXXFLAGS', '-DENABLE_NLS') @@ -387,6 +408,8 @@ def options(opt): 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('--backtrace', action='store_true', default=True, dest='backtrace', + help='Compile with -rdynamic -- allow obtaining backtraces from within Ardour') 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', @@ -402,16 +425,12 @@ def options(opt): help='Install MIME type, icons and .desktop file as per freedesktop.org standards') 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('--internal-shared-libs', action='store_true', default=True, dest='internal_shared_libs', help='Build internal libs as shared libraries') opt.add_option('--internal-static-libs', action='store_false', dest='internal_shared_libs', help='Build internal libs as static libraries') - opt.add_option('--videotimeline', action='store_true', default=False, dest='videotimeline', - help='Compile with support for video-timeline') 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('--no-lv2', action='store_false', dest='lv2', @@ -435,6 +454,8 @@ def options(opt): 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('--single-tests', action='store_true', default=False, dest='single_tests', + help="Build a single executable for each unit test") #opt.add_option('--tranzport', action='store_true', default=False, dest='tranzport', # help='Compile with support for Frontier Designs Tranzport (if libusb is available)') opt.add_option('--universal', action='store_true', default=False, dest='universal', @@ -458,6 +479,8 @@ def options(opt): help='directory where Wine\'s Windows header files can be found') opt.add_option('--noconfirm', action='store_true', default=False, dest='noconfirm', help='Do not ask questions that require confirmation during the build') + opt.add_option('--cxx11', action='store_true', default=False, dest='cxx11', + help='Turn on c++11 compiler flags (-std=c++11)') for i in children: opt.recurse(i) @@ -469,6 +492,8 @@ def configure(conf): conf.load('compiler_c') conf.load('compiler_cxx') conf.env['VERSION'] = VERSION + conf.env['MAJOR'] = MAJOR + conf.env['MINOR'] = MINOR conf.line_just = 52 autowaf.set_recursive() autowaf.configure(conf) @@ -517,6 +542,11 @@ def configure(conf): else: autowaf.display_msg(conf, 'Will build against private Ardour dependency stack', 'no') + if Options.options.freebie: + conf.env.append_value ('CFLAGS', '-DNO_PLUGIN_STATE') + conf.env.append_value ('CXXFLAGS', '-DNO_PLUGIN_STATE') + conf.define ('NO_PLUGIN_STATE', 1) + if sys.platform == 'darwin': # this is required, potentially, for anything we link and then relocate into a bundle @@ -525,9 +555,6 @@ def configure(conf): conf.define ('HAVE_COREAUDIO', 1) conf.define ('AUDIOUNIT_SUPPORT', 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) @@ -566,9 +593,6 @@ def configure(conf): 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 re.search ("^[1-9][0-9]\.", os.uname()[2]) == None and not Options.options.nocarbon: conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DWITH_CARBON") conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Carbon']) @@ -592,8 +616,6 @@ def configure(conf): if Options.options.boost_sp_debug: conf.env.append_value('CXXFLAGS', '-DBOOST_SP_ENABLE_DEBUG_HOOKS') - autowaf.check_header(conf, 'cxx', 'jack/session.h', define="JACK_SESSION", mandatory = False) - conf.check_cxx(fragment = "#include \nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n", execute = "1", mandatory = True, @@ -607,6 +629,7 @@ def configure(conf): 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') autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL', atleast_version='7.0.0') + autowaf.check_pkg(conf, 'liblo', uselib_store='LO', atleast_version='0.26') conf.check_cc(function_name='dlopen', header_name='dlfcn.h', lib='dl', uselib_store='DL') @@ -622,19 +645,15 @@ def configure(conf): conf.env['PHONE_HOME'] = True if opts.fpu_optimization: conf.env['FPU_OPTIMIZATION'] = True - if opts.freesound: - conf.define('FREESOUND',1) - conf.env['FREESOUND'] = True if opts.nls: conf.define('ENABLE_NLS', 1) conf.env['ENABLE_NLS'] = True if opts.build_tests: conf.env['BUILD_TESTS'] = opts.build_tests + if opts.single_tests: + conf.env['SINGLE_TESTS'] = opts.single_tests #if opts.tranzport: # conf.env['TRANZPORT'] = 1 - if opts.videotimeline: - conf.define('WITH_VIDEOTIMELINE',1) - conf.env['VIDEOTIMELINE'] = 1 if opts.windows_vst: conf.define('WINDOWS_VST_SUPPORT', 1) conf.env['WINDOWS_VST_SUPPORT'] = True @@ -644,8 +663,6 @@ def configure(conf): if opts.lxvst: conf.define('LXVST_SUPPORT', 1) conf.env['LXVST_SUPPORT'] = True - if bool(conf.env['JACK_SESSION']): - conf.define('HAVE_JACK_SESSION', 1) conf.define('WINDOWS_KEY', opts.windows_key) conf.env['PROGRAM_NAME'] = opts.program_name if opts.rt_alloc_debug: @@ -682,6 +699,7 @@ const char* const ardour_config_info = "\\n\\ write_config_text('Build documentation', conf.env['DOCS']) write_config_text('Debuggable build', conf.env['DEBUG']) + write_config_text('Export all symbols (backtrace)', opts.backtrace) write_config_text('Install prefix', conf.env['PREFIX']) write_config_text('Strict compiler flags', conf.env['STRICT']) write_config_text('Internal Shared Libraries', conf.is_defined('INTERNAL_SHARED_LIBS')) @@ -689,7 +707,7 @@ const char* const ardour_config_info = "\\n\\ write_config_text('Architecture flags', opts.arch) write_config_text('Aubio', conf.is_defined('HAVE_AUBIO')) write_config_text('AudioUnits', conf.is_defined('AUDIOUNIT_SUPPORT')) - write_config_text('AU state support', conf.is_defined('AU_STATE_SUPPORT')) + write_config_text('No plugin state', conf.is_defined('NO_PLUGIN_STATE')) 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')) @@ -698,8 +716,6 @@ const char* const ardour_config_info = "\\n\\ write_config_text('FLAC', conf.is_defined('HAVE_FLAC')) write_config_text('FPU optimization', opts.fpu_optimization) write_config_text('Freedesktop files', opts.freedesktop) - write_config_text('Freesound', opts.freesound) - write_config_text('JACK session support', conf.is_defined('JACK_SESSION')) write_config_text('LV2 UI embedding', conf.is_defined('HAVE_SUIL')) write_config_text('LV2 support', conf.is_defined('LV2_SUPPORT')) write_config_text('LXVST support', conf.is_defined('LXVST_SUPPORT')) @@ -713,7 +729,6 @@ const char* const ardour_config_info = "\\n\\ # write_config_text('Tranzport', opts.tranzport) write_config_text('Unit tests', conf.env['BUILD_TESTS']) write_config_text('Universal binary', opts.universal) - write_config_text('Videotimeline', opts.videotimeline) write_config_text('Generic x86 CPU', opts.generic) write_config_text('Windows VST support', opts.windows_vst) write_config_text('Wiimote support', conf.is_defined('BUILD_WIIMOTE'))