X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=68054f54d3699264528ac16b7c7c097b1b534d52;hb=098a6980520183796f3c2faac6262224a6b0b4b3;hp=7e7fe013e81e37282453bf24846f341e85798b56;hpb=95ccbc452f513a9d6f70de45bc413067e568364c;p=ardour.git diff --git a/wscript b/wscript index 7e7fe013e8..68054f54d3 100644 --- a/wscript +++ b/wscript @@ -16,7 +16,7 @@ def fetch_git_revision (): def fetch_tarball_revision (): if not os.path.exists ('libs/ardour/revision.cc'): - print 'This tarball was not created correctly - it is missing libs/ardour/revision.cc' + print ('This tarball was not created correctly - it is missing libs/ardour/revision.cc') sys.exit (1) with open('libs/ardour/revision.cc') as f: content = f.readlines() @@ -30,13 +30,17 @@ else: # # rev is now of the form MAJOR.MINOR-rev-commit +# or, if right at the same rev as a release, MAJOR.MINOR # parts = rev.split ('.') MAJOR = parts[0] other = parts[1].split ('-') MINOR = other[0] -MICRO = other[1] +if len(other) > 1: + MICRO = other[1] +else: + MICRO = '0' V = MAJOR + '.' + MINOR + '.' + MICRO # @@ -44,7 +48,7 @@ V = MAJOR + '.' + MINOR + '.' + MICRO # because if it is, it breaks waf somehow. # VERSION = V.encode ('ascii', 'ignore') -APPNAME = 'Ardour' + MAJOR +PROGRAM_VERSION = MAJOR.encode ('ascii', 'ignore') # Mandatory variables top = '.' @@ -77,6 +81,7 @@ children = [ # shared helper binaries (plugin-scanner, exec-wrapper) 'libs/fst', 'libs/vfork', + 'libs/ardouralsautil', ] i18n_children = [ @@ -148,15 +153,6 @@ def set_compiler_flags (conf,opt): # 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"]) - cxx_flags.append('-std=c++11') - if platform == "darwin": - cxx_flags.append('-stdlib=libc++') - link_flags.append('-lc++') - # Prevents visibility issues in standard headers - conf.define("_DARWIN_C_SOURCE", 1) - if conf.options.asan: conf.check_cxx(cxxflags=["-fsanitize=address", "-fno-omit-frame-pointer"], linkflags=["-fsanitize=address"]) cxx_flags.append('-fsanitize=address') @@ -186,8 +182,10 @@ def set_compiler_flags (conf,opt): conf.env['build_target'] = 'snowleopard' elif re.search ("^11[.]", version) != None: conf.env['build_target'] = 'lion' - else: + elif re.search ("^12[.]", version) != None: conf.env['build_target'] = 'mountainlion' + else: + conf.env['build_target'] = 'mavericks' # 13.0.0 else: match = re.search( "(?Pi[0-6]86|x86_64|powerpc|ppc|ppc64|arm|s390x?)", @@ -208,6 +206,15 @@ def set_compiler_flags (conf,opt): # compiler_flags.append ('-U__STRICT_ANSI__') + if conf.options.cxx11 or conf.env['build_target'] == 'mavericks': + conf.check_cxx(cxxflags=["-std=c++11"]) + cxx_flags.append('-std=c++11') + if platform == "darwin": + cxx_flags.append('-stdlib=libc++') + linker_flags.append('-lc++') + # Prevents visibility issues in standard headers + conf.define("_DARWIN_C_SOURCE", 1) + if ((re.search ("i[0-9]86", cpu) != None) or (re.search ("x86_64", cpu) != None)) and conf.env['build_target'] != 'none': @@ -252,7 +259,7 @@ def set_compiler_flags (conf,opt): if conf.env['FPU_OPTIMIZATION']: if sys.platform == 'darwin': compiler_flags.append("-DBUILD_VECLIB_OPTIMIZATIONS"); - linker_flags.append("-framework Accelerate") + conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'Accelerate']) elif conf.env['build_target'] == 'i686' or conf.env['build_target'] == 'x86_64': compiler_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") if not build_host_supports_sse: @@ -330,6 +337,9 @@ def set_compiler_flags (conf,opt): "-fstrength-reduce" ] + if opt.debug_symbols: + optimization_flags += [ '-g' ] + if opt.stl_debug: cxx_flags.append("-D_GLIBCXX_DEBUG") @@ -370,6 +380,7 @@ def set_compiler_flags (conf,opt): compiler_flags.append('-DENABLE_NLS') compiler_flags.append ('-DPROGRAM_NAME="' + Options.options.program_name + '"') + compiler_flags.append ('-DPROGRAM_VERSION="' + PROGRAM_VERSION + '"') if opt.debug: conf.env.append_value('CFLAGS', debug_flags) @@ -402,12 +413,18 @@ def options(opt): help='Whether to build for TRX') opt.add_option('--arch', type='string', action='store', dest='arch', help='Architecture-specific compiler flags') + opt.add_option('--with-dummy', action='store_true', default=False, dest='build_dummy', + help='Build the dummy backend (no audio/MIDI I/O, useful for profiling)') + opt.add_option('--with-alsabackend', action='store_true', default=False, dest='build_alsabackend', + help='Build the ALSA backend') 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', help='Compile with Boost shared pointer debugging') + opt.add_option('--debug-symbols', action='store_true', default=False, dest='debug_symbols', + help='Add debug-symbols to optimized builds') opt.add_option('--depstack-root', type='string', default='~', dest='depstack_root', help='Directory/folder where dependency stack trees (gtk, a3) can be found (defaults to ~)') opt.add_option('--dist-target', type='string', default='auto', dest='dist_target', @@ -639,6 +656,9 @@ def configure(conf): okmsg = 'ok', errmsg = 'too old\nPlease install boost version 1.39 or higher.') + if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw': + autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA') + autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.2', mandatory=True) autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.2', mandatory=True) autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.32.0', mandatory=True) @@ -717,10 +737,10 @@ def configure(conf): conf.env['LXVST_SUPPORT'] = False elif Options.options.dist_target == 'mingw': conf.env['LXVST_SUPPORT'] = False - else: - conf.define('LXVST_SUPPORT', 1) - conf.env['LXVST_SUPPORT'] = True - conf.define('WINDOWS_KEY', opts.windows_key) + else: + conf.define('LXVST_SUPPORT', 1) + conf.env['LXVST_SUPPORT'] = True + conf.env['WINDOWS_KEY'] = opts.windows_key if opts.rt_alloc_debug: conf.define('DEBUG_RT_ALLOC', 1) conf.env['DEBUG_RT_ALLOC'] = True @@ -732,6 +752,10 @@ def configure(conf): conf.env['DEBUG_DENORMAL_EXCEPTION'] = True if opts.build_tests: autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=True) + if opts.build_alsabackend: + conf.env['BUILD_ALSABACKEND'] = True + if opts.build_dummy: + conf.env['BUILD_DUMMYBACKEND'] = True set_compiler_flags (conf, Options.options) @@ -770,6 +794,8 @@ const char* const ardour_config_info = "\\n\\ write_config_text('Use External Libraries', conf.is_defined('USE_EXTERNAL_LIBS')) write_config_text('Library exports hidden', conf.is_defined('EXPORT_VISIBILITY_HIDDEN')) + write_config_text('ALSA Backend', opts.build_alsabackend) + write_config_text('ALSA DBus Reservation', conf.is_defined('HAVE_DBUS')) 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')) @@ -777,6 +803,8 @@ const char* const ardour_config_info = "\\n\\ 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('Debug Symbols', conf.is_defined('debug_symbols') or conf.env['DEBUG']) + write_config_text('Dummy backend', opts.build_dummy) 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')) @@ -847,7 +875,7 @@ def build(bld): for i in children: bld.recurse(i) - bld.install_files (bld.env['SYSCONFDIR'], 'ardour_system.rc') + bld.install_files (bld.env['CONFDIR'], 'ardour_system.rc') if bld.env['RUN_TESTS']: bld.add_post_fun(test)