X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=8d874b9b47177a05fa39a0bfd743d3faeda25d6c;hb=077a194430f9e1c66b6ad3526ff8a54ecf390c5f;hp=22f1d90c6dfc89e7729b118edf949283bd5e7c85;hpb=b855e5f3220027502a3c88f189d511fe2a5a3c2b;p=ardour.git diff --git a/wscript b/wscript index 22f1d90c6d..8d874b9b47 100644 --- a/wscript +++ b/wscript @@ -6,11 +6,44 @@ import re import string import subprocess import sys +import platform as PLATFORM -MAJOR = '3' -MINOR = '5' -VERSION = MAJOR + '.' + MINOR +def fetch_git_revision (): + 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 +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' + sys.exit (1) + with open('libs/ardour/revision.cc') as f: + content = f.readlines() + remove_punctuation_map = dict((ord(char), None) for char in '";') + return content[1].decode('utf-8').strip().split(' ')[7].translate (remove_punctuation_map) + +if os.path.isdir (os.path.join(os.getcwd(), '.git')): + rev = fetch_git_revision () +else: + rev = fetch_tarball_revision () + +# +# rev is now of the form MAJOR.MINOR-rev-commit +# + +parts = rev.split ('.') +MAJOR = parts[0] +other = parts[1].split ('-') +MINOR = other[0] +MICRO = other[1] + +V = MAJOR + '.' + MINOR + '.' + MICRO +# +# it is important that VERSION *not* be unicode string +# because if it is, it breaks waf somehow. +# +VERSION = V.encode ('ascii', 'ignore') APPNAME = 'Ardour' + MAJOR # Mandatory variables @@ -18,15 +51,14 @@ top = '.' out = 'build' children = [ - 'libs/pbd', - 'libs/midi++2', - 'libs/evoral', - 'libs/vamp-sdk', + # optionally external libraries 'libs/qm-dsp', 'libs/vamp-plugins', - 'libs/taglib', 'libs/libltc', - 'libs/rubberband', + # core ardour libraries + 'libs/pbd', + 'libs/midi++2', + 'libs/evoral', 'libs/surfaces', 'libs/panners', 'libs/backends', @@ -35,11 +67,16 @@ children = [ 'libs/gtkmm2ext', 'libs/audiographer', 'libs/canvas', + 'libs/plugins/reasonablesynth.lv2', 'gtk2_ardour', 'export', 'midi_maps', 'mcp', - 'patchfiles' + 'patchfiles', + 'headless', + # shared helper binaries (plugin-scanner, exec-wrapper) + 'libs/fst', + 'libs/vfork', ] i18n_children = [ @@ -51,23 +88,17 @@ i18n_children = [ # Version stuff def fetch_gcc_version (CC): - cmd = "LANG= %s --version" % CC + cmd = "%s --version" % CC output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines() o = output[0].decode('utf-8') version = o.split(' ')[2].split('.') return version -def fetch_git_revision (): - cmd = "git describe --tags HEAD" - output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines() - rev = output[0].decode('utf-8') - return rev - def create_stored_revision(): rev = "" if os.path.exists('.git'): rev = fetch_git_revision(); - print("ardour.git version: " + rev + "\n") + print("Git version: " + rev + "\n") elif os.path.exists('libs/ardour/revision.cc'): print("Using packaged revision") return @@ -76,6 +107,10 @@ def create_stored_revision(): sys.exit(-1) try: + # + # if you change the format of this, be sure to fix fetch_tarball_revision() above + # so that it still works. + # text = '#include "ardour/revision.h"\n' text += 'namespace ARDOUR { const char* revision = \"%s\"; }\n' % rev print('Writing revision info to libs/ardour/revision.cc using ' + rev) @@ -92,10 +127,20 @@ def set_compiler_flags (conf,opt): # build_host_supports_sse = False + + # Flags necessary for building + compiler_flags = [] # generic + c_flags = [] # C-specific + cxx_flags = [] # C++-specific + linker_flags = [] + + # Optimization flags (overridable) optimization_flags = [] + + # Debugging flags debug_flags = [] - u = os.uname () + u = PLATFORM.uname () cpu = u[4] platform = u[0].lower() version = u[2] @@ -105,27 +150,28 @@ def set_compiler_flags (conf,opt): if conf.options.cxx11: conf.check_cxx(cxxflags=["-std=c++11"]) - conf.env.append_unique('CXXFLAGS', ['-std=c++11']) + cxx_flags.append('-std=c++11') if platform == "darwin": - conf.env.append_unique('CXXFLAGS', ['-stdlib=libc++']) - conf.env.append_unique('LINKFLAGS', ['-lc++']) + 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') + cxx_flags.append('-fno-omit-frame-pointer') + linker_flags.append('-fsanitize=address') + 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"]) + cxx_flags.append("-Qunused-arguments") if opt.gprofile: debug_flags = [ '-pg' ] - if opt.backtrace: - if opt.dist_target == 'auto': - if platform != 'darwin' and not is_clang: - debug_flags = [ '-rdynamic' ] - # Autodetect if opt.dist_target == 'auto': if platform == 'darwin': @@ -143,16 +189,15 @@ def set_compiler_flags (conf,opt): else: conf.env['build_target'] = 'mountainlion' else: - if re.search ("x86_64", cpu) != None: - conf.env['build_target'] = 'x86_64' - elif re.search("i[0-5]86", cpu) != None: - 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' + match = re.search( + "(?Pi[0-6]86|x86_64|powerpc|ppc|ppc64|arm|s390x?)", + cpu) + if (match): + conf.env['build_target'] = match.group("cpu") + if re.search("i[0-5]86", conf.env['build_target']): + conf.env['build_target'] = "i386" else: - conf.env['build_target'] = 'i686' + conf.env['build_target'] = 'none' else: conf.env['build_target'] = opt.dist_target @@ -161,8 +206,7 @@ def set_compiler_flags (conf,opt): # stupid OS X 10.6 has a bug in math.h that prevents llrint and friends # from being visible. # - debug_flags.append ('-U__STRICT_ANSI__') - optimization_flags.append ('-U__STRICT_ANSI__') + compiler_flags.append ('-U__STRICT_ANSI__') if cpu == 'powerpc' and conf.env['build_target'] != 'none': # @@ -174,12 +218,12 @@ def set_compiler_flags (conf,opt): if platform == 'darwin': # optimization_flags.extend ([ "-mcpu=7450", "-faltivec"]) # to support g3s but still have some optimization for above - optimization_flags.extend ([ "-mcpu=G3", "-mtune=7450"]) + compiler_flags.extend ([ "-mcpu=G3", "-mtune=7450"]) else: - optimization_flags.extend ([ "-mcpu=7400", "-maltivec", "-mabi=altivec"]) + compiler_flags.extend ([ "-mcpu=7400", "-maltivec", "-mabi=altivec"]) else: - optimization_flags.extend([ "-mcpu=750", "-mmultiple" ]) - optimization_flags.extend (["-mhard-float", "-mpowerpc-gfxopt"]) + compiler_flags.extend([ "-mcpu=750", "-mmultiple" ]) + compiler_flags.extend (["-mhard-float", "-mpowerpc-gfxopt"]) optimization_flags.extend (["-Os"]) elif ((re.search ("i[0-9]86", cpu) != None) or (re.search ("x86_64", cpu) != None)) and conf.env['build_target'] != 'none': @@ -192,8 +236,7 @@ def set_compiler_flags (conf,opt): # if (re.search ("(i[0-9]86|x86_64)", cpu) != None): - debug_flags.append ("-DARCH_X86") - optimization_flags.append ("-DARCH_X86") + compiler_flags.append ("-DARCH_X86") if platform == 'linux' : @@ -207,32 +250,29 @@ def set_compiler_flags (conf,opt): x86_flags = flag_line.split (": ")[1:][0].split () if "mmx" in x86_flags: - optimization_flags.append ("-mmmx") + compiler_flags.append ("-mmmx") if "sse" in x86_flags: build_host_supports_sse = True if "3dnow" in x86_flags: - optimization_flags.append ("-m3dnow") + compiler_flags.append ("-m3dnow") if cpu == "i586": - optimization_flags.append ("-march=i586") + compiler_flags.append ("-march=i586") elif cpu == "i686": - optimization_flags.append ("-march=i686") + compiler_flags.append ("-march=i686") if not is_clang and ((conf.env['build_target'] == 'i686') or (conf.env['build_target'] == 'x86_64')) and build_host_supports_sse: - optimization_flags.extend (["-msse", "-mfpmath=sse", "-DUSE_XMMINTRIN"]) - debug_flags.extend (["-msse", "-mfpmath=sse", "-DUSE_XMMINTRIN"]) + compiler_flags.extend (["-msse", "-mfpmath=sse", "-DUSE_XMMINTRIN"]) # end of processor-specific section # optimization section if conf.env['FPU_OPTIMIZATION']: if sys.platform == 'darwin': - optimization_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS"); - debug_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS"); - conf.env.append_value('LINKFLAGS', "-framework Accelerate") + compiler_flags.append("-DBUILD_VECLIB_OPTIMIZATIONS"); + linker_flags.append("-framework Accelerate") 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") + compiler_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") 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)") @@ -251,9 +291,9 @@ def set_compiler_flags (conf,opt): if conf.env['LXVST_SUPPORT'] == True: if conf.env['build_target'] == 'x86_64': - conf.env.append_value('CXXFLAGS', "-DLXVST_64BIT") + compiler_flags.append("-DLXVST_64BIT") else: - conf.env.append_value('CXXFLAGS', "-DLXVST_32BIT") + compiler_flags.append("-DLXVST_32BIT") # # a single way to test if we're on OS X @@ -263,18 +303,15 @@ def set_compiler_flags (conf,opt): conf.define ('IS_OSX', 1) # force tiger or later, to avoid issues on PPC which defaults # back to 10.1 if we don't tell it otherwise. - - conf.env.append_value('CFLAGS', "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040") - conf.env.append_value('CXXFLAGS', "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040") - conf.env.append_value('CXXFLAGS', '-mmacosx-version-min=10.4') - conf.env.append_value('CFLAGS', '-mmacosx-version-min=10.4') + compiler_flags.extend( + ("-DMAC_OS_X_VERSION_MIN_REQUIRED=1040", + '-mmacosx-version-min=10.4')) elif conf.env['build_target'] in [ 'lion', 'mountainlion' ]: - conf.env.append_value('CFLAGS', "-DMAC_OS_X_VERSION_MIN_REQUIRED=1070") - conf.env.append_value('CXXFLAGS', "-DMAC_OS_X_VERSION_MIN_REQUIRED=1070") - conf.env.append_value('CXXFLAGS', '-mmacosx-version-min=10.7') - conf.env.append_value('CFLAGS', '-mmacosx-version-min=10.7') + compiler_flags.extend( + ("-DMAC_OS_X_VERSION_MIN_REQUIRED=1070", + '-mmacosx-version-min=10.7')) else: conf.define ('IS_OSX', 0) @@ -294,34 +331,32 @@ def set_compiler_flags (conf,opt): # prepend boiler plate optimization flags that work on all architectures # - optimization_flags[:0] = [ - "-O3", - "-fomit-frame-pointer", - "-ffast-math", - "-fstrength-reduce", - "-pipe" - ] + optimization_flags[:0] = ["-pipe"] - if opt.debug: - conf.env.append_value('CFLAGS', debug_flags) - conf.env.append_value('CXXFLAGS', debug_flags) - conf.env.append_value('LINKFLAGS', debug_flags) - else: - conf.env.append_value('CFLAGS', optimization_flags) - conf.env.append_value('CXXFLAGS', optimization_flags) - conf.env.append_value('LINKFLAGS', optimization_flags) + # don't prepend optimization flags if "-O" is present + prepend_opt_flags = True + for flag in optimization_flags: + if flag.startswith("-O"): + prepend_opt_flags = False + break + + if prepend_opt_flags: + optimization_flags[:0] = [ + "-O3", + "-fomit-frame-pointer", + "-ffast-math", + "-fstrength-reduce" + ] if opt.stl_debug: - conf.env.append_value('CXXFLAGS', "-D_GLIBCXX_DEBUG") + cxx_flags.append("-D_GLIBCXX_DEBUG") if conf.env['DEBUG_RT_ALLOC']: - conf.env.append_value('CFLAGS', '-DDEBUG_RT_ALLOC') - conf.env.append_value('CXXFLAGS', '-DDEBUG_RT_ALLOC') - conf.env.append_value('LINKFLAGS', '-ldl') + compiler_flags.append('-DDEBUG_RT_ALLOC') + linker_flags.append('-ldl') if conf.env['DEBUG_DENORMAL_EXCEPTION']: - conf.env.append_value('CFLAGS', '-DDEBUG_DENORMAL_EXCEPTION') - conf.env.append_value('CXXFLAGS', '-DDEBUG_DENORMAL_EXCEPTION') + compiler_flags.append('-DDEBUG_DENORMAL_EXCEPTION') if opt.universal: if opt.generic: @@ -329,62 +364,61 @@ def set_compiler_flags (conf,opt): sys.exit (1) else: 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"]) + compiler_flags.extend(("-arch", "i386", "-arch", "ppc")) + linker_flags.extend(("-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"]) + compiler_flags.extend( + ("-arch", "x86_64", "-arch", "i386", "-arch", "ppc")) + linker_flags.extend( + ("-arch", "x86_64", "-arch", "i386", "-arch", "ppc")) else: if opt.generic: - conf.env.append_value('CFLAGS', ['-arch', 'i386']) - conf.env.append_value('CXXFLAGS', ['-arch', 'i386']) - conf.env.append_value('LINKFLAGS', ['-arch', 'i386']) + compiler_flags.extend(('-arch', 'i386')) + linker_flags.extend(('-arch', 'i386')) # # warnings flags # - conf.env.append_value('CFLAGS', [ '-Wall', - '-Wpointer-arith', - '-Wcast-qual', - '-Wcast-align', - '-Wstrict-prototypes', - '-Wmissing-prototypes' - ]) - - conf.env.append_value('CXXFLAGS', [ '-Wall', - '-Wpointer-arith', - '-Wcast-qual', - '-Wcast-align', - '-Woverloaded-virtual' - ]) + compiler_flags.extend( + ('-Wall', '-Wpointer-arith', '-Wcast-qual', '-Wcast-align')) + c_flags.extend(('-Wstrict-prototypes', '-Wmissing-prototypes')) + cxx_flags.append('-Woverloaded-virtual') # # more boilerplate # - 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') + compiler_flags.extend( + ('-DBOOST_SYSTEM_NO_DEPRECATED', '-D_ISOC9X_SOURCE', + '-D_LARGEFILE64_SOURCE', '-D_FILE_OFFSET_BITS=64')) + cxx_flags.extend( + ('-D__STDC_LIMIT_MACROS', '-D__STDC_FORMAT_MACROS', + '-DCANVAS_COMPATIBILITY', '-DCANVAS_DEBUG')) + + if opt.nls: + compiler_flags.append('-DENABLE_NLS') - 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') + compiler_flags.append ('-DPROGRAM_NAME="' + Options.options.program_name + '"') - if opt.nls: - conf.env.append_value('CXXFLAGS', '-DENABLE_NLS') - conf.env.append_value('CFLAGS', '-DENABLE_NLS') + if opt.debug: + conf.env.append_value('CFLAGS', debug_flags) + conf.env.append_value('CXXFLAGS', debug_flags) + else: + conf.env.append_value('CFLAGS', optimization_flags) + conf.env.append_value('CXXFLAGS', optimization_flags) + + if opt.backtrace: + if platform != 'darwin' and not is_clang and not Options.options.dist_target == 'mingw': + linker_flags += [ '-rdynamic' ] + + conf.env.append_value('CFLAGS', compiler_flags) + conf.env.append_value('CFLAGS', c_flags) + conf.env.append_value('CXXFLAGS', compiler_flags) + conf.env.append_value('CXXFLAGS', cxx_flags) + conf.env.append_value('LINKFLAGS', linker_flags) #---------------------------------------------------------------- @@ -411,6 +445,7 @@ def options(opt): 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('--exports-hidden', action='store_true', default=False, dest='exports_hidden') 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('--freebie', action='store_true', default=False, dest='freebie', @@ -421,10 +456,13 @@ def options(opt): 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('--use-external-libs', action='store_true', default=False, dest='use_external_libs', + help='Use external/system versions of some bundled libraries') 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', help='Do not compile with support for LV2') + opt.add_option('--lv2dir', type='string', help="install destination for builtin LV2 bundles [Default: LIBDIR/lv2]") opt.add_option('--lxvst', action='store_true', default=True, dest='lxvst', help='Compile with support for linuxVST plugins') opt.add_option('--nls', action='store_true', default=True, dest='nls', @@ -444,6 +482,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('--run-tests', action='store_true', default=False, dest='run_tests', + help="Run tests after build") 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', @@ -471,6 +511,8 @@ def options(opt): 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)') + opt.add_option('--address-sanitizer', action='store_true', default=False, dest='asan', + help='Turn on AddressSanitizer (requires GCC >= 4.8 or clang >= 3.1)') for i in children: opt.recurse(i) @@ -537,6 +579,13 @@ def configure(conf): conf.env.append_value ('CXXFLAGS', '-DNO_PLUGIN_STATE') conf.define ('NO_PLUGIN_STATE', 1) + if Options.options.lv2dir: + conf.env['LV2DIR'] = Options.options.lv2dir + else: + conf.env['LV2DIR'] = os.path.join(conf.env['LIBDIR'], 'lv2') + + conf.env['LV2DIR'] = os.path.normpath(conf.env['LV2DIR']) + if sys.platform == 'darwin': # this is required, potentially, for anything we link and then relocate into a bundle @@ -593,6 +642,9 @@ def configure(conf): if Options.options.internal_shared_libs: conf.define('INTERNAL_SHARED_LIBS', 1) + if Options.options.use_external_libs: + conf.define('USE_EXTERNAL_LIBS', 1) + if Options.options.boost_include != '': conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include) @@ -606,20 +658,26 @@ def configure(conf): if Options.options.boost_sp_debug: conf.env.append_value('CXXFLAGS', '-DBOOST_SP_ENABLE_DEBUG_HOOKS') - conf.check_cxx(fragment = "#include \nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n", + # executing a test program is n/a when cross-compiling + if Options.options.dist_target != 'mingw': + conf.check_cxx(fragment = "#include \nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n", execute = "1", mandatory = True, msg = 'Checking for boost library >= 1.39', okmsg = 'ok', errmsg = 'too old\nPlease install boost version 1.39 or higher.') - autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.2') - 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.32.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') - 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') + 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) + autowaf.check_pkg(conf, 'sndfile', uselib_store='SNDFILE', atleast_version='1.0.18, mandatory=True') + autowaf.check_pkg(conf, 'giomm-2.4', uselib_store='GIOMM', atleast_version='2.2', mandatory=True) + autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL', atleast_version='7.0.0', mandatory=True) + autowaf.check_pkg(conf, 'liblo', uselib_store='LO', atleast_version='0.26', mandatory=True) + autowaf.check_pkg(conf, 'taglib', uselib_store='TAGLIB', atleast_version='1.6', mandatory=True) + autowaf.check_pkg(conf, 'vamp-sdk', uselib_store='VAMPSDK', atleast_version='2.4', mandatory=True) + autowaf.check_pkg(conf, 'vamp-hostsdk', uselib_store='VAMPHOSTSDK', atleast_version='2.4', mandatory=True) + autowaf.check_pkg(conf, 'rubberband', uselib_store='RUBBERBAND', mandatory=True) if Options.options.dist_target == 'mingw': Options.options.fpu_optimization = False @@ -627,7 +685,7 @@ def configure(conf): conf.env.append_value('CFLAGS', '-DCOMPILER_MINGW') conf.env.append_value('CXXFLAGS', '-DPLATFORM_WINDOWS') conf.env.append_value('CXXFLAGS', '-DCOMPILER_MINGW') - conf.env.append_value('LIB', 'pthreadGC2') + conf.env.append_value('LIB', 'pthread') # needed for at least libsmf conf.check_cc(function_name='htonl', header_name='winsock2.h', lib='ws2_32') conf.env.append_value('LIB', 'ws2_32') @@ -653,8 +711,23 @@ def configure(conf): conf.env.append_value('CFLAGS', '-DWAF_BUILD') conf.env.append_value('CXXFLAGS', '-DWAF_BUILD') - # Set up waf environment and C defines opts = Options.options + + # (optionally) Adopt Microsoft-like convention that makes all non-explicitly exported + # symbols invisible (rather than doing this all over the wscripts in the src tree) + # + # This won't apply to MSVC but that hasn't been added as a target yet + # + # We can't do this till all tests are complete, since some fail if this is et. + if opts.exports_hidden: + conf.define ('EXPORT_VISIBILITY_HIDDEN', True) + if opts.internal_shared_libs: + conf.env.append_value ('CXXFLAGS', '-fvisibility=hidden') + conf.env.append_value ('CFLAGS', '-fvisibility=hidden') + else: + conf.define ('EXPORT_VISIBILITY_HIDDEN', False) + + # Set up waf environment and C defines if opts.phone_home: conf.define('PHONE_HOME', 1) conf.env['PHONE_HOME'] = True @@ -664,7 +737,8 @@ def configure(conf): conf.define('ENABLE_NLS', 1) conf.env['ENABLE_NLS'] = True if opts.build_tests: - conf.env['BUILD_TESTS'] = opts.build_tests + conf.env['BUILD_TESTS'] = True + conf.env['RUN_TESTS'] = opts.run_tests if opts.single_tests: conf.env['SINGLE_TESTS'] = opts.single_tests #if opts.tranzport: @@ -672,9 +746,10 @@ def configure(conf): 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 not Options.options.dist_target == 'mingw': + 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: if sys.platform == 'darwin': conf.env['LXVST_SUPPORT'] = False @@ -684,7 +759,6 @@ def configure(conf): conf.define('LXVST_SUPPORT', 1) conf.env['LXVST_SUPPORT'] = True conf.define('WINDOWS_KEY', opts.windows_key) - conf.env['PROGRAM_NAME'] = opts.program_name if opts.rt_alloc_debug: conf.define('DEBUG_RT_ALLOC', 1) conf.env['DEBUG_RT_ALLOC'] = True @@ -722,7 +796,7 @@ const char* const ardour_config_info = "\\n\\ def write_config_text(title, val): autowaf.display_msg(conf, title, val) config_text.write(title + ': ') - config_text.write(str(val)) + config_text.write(str(val).replace ('"', '\\"')) config_text.write("\\n\\\n") write_config_text('Build documentation', conf.env['DOCS']) @@ -731,6 +805,8 @@ const char* const ardour_config_info = "\\n\\ 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')) + 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('Architecture flags', opts.arch) write_config_text('Aubio', conf.is_defined('HAVE_AUBIO')) @@ -750,7 +826,6 @@ const char* const ardour_config_info = "\\n\\ write_config_text('OGG', conf.is_defined('HAVE_OGG')) write_config_text('Phone home', conf.is_defined('PHONE_HOME')) 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('Translation', opts.nls) @@ -764,7 +839,7 @@ const char* const ardour_config_info = "\\n\\ write_config_text('C compiler flags', conf.env['CFLAGS']) write_config_text('C++ compiler flags', conf.env['CXXFLAGS']) - write_config_text('Linker flags', conf.env['LINKFLAGS']) + write_config_text('Linker flags', conf.env['LINKFLAGS']) config_text.write ('";\n}\n') config_text.close () @@ -775,15 +850,13 @@ def build(bld): # add directories that contain only headers, to workaround an issue with waf + if not bld.is_defined('USE_EXTERNAL_LIBS'): + bld.path.find_dir ('libs/libltc/ltc') bld.path.find_dir ('libs/evoral/evoral') - bld.path.find_dir ('libs/vamp-sdk/vamp-sdk') bld.path.find_dir ('libs/surfaces/control_protocol/control_protocol') bld.path.find_dir ('libs/timecode/timecode') - bld.path.find_dir ('libs/libltc/ltc') - bld.path.find_dir ('libs/rubberband/rubberband') bld.path.find_dir ('libs/gtkmm2ext/gtkmm2ext') bld.path.find_dir ('libs/ardour/ardour') - bld.path.find_dir ('libs/taglib/taglib') bld.path.find_dir ('libs/pbd/pbd') autowaf.set_recursive() @@ -801,6 +874,9 @@ def build(bld): bld.install_files (os.path.join(bld.env['SYSCONFDIR'], 'ardour3', ), 'ardour_system.rc') + if bld.env['RUN_TESTS']: + bld.add_post_fun(test) + def i18n(bld): bld.recurse (i18n_children) @@ -815,3 +891,6 @@ def i18n_mo(bld): def tarball(bld): create_stored_revision() + +def test(bld): + subprocess.call("gtk2_ardour/artest")