X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=ba625818e0fb192d38fced2132442ae36dbfcc9c;hb=9e941a56472249952d1a226408327e8390a83fc1;hp=8a4912d47b9d34a876242ba92155c33521ed2803;hpb=27fdf5f6e3e5f5093e11fe3b615815c3dbbfdfff;p=ardour.git diff --git a/wscript b/wscript index 8a4912d47b..ba625818e0 100644 --- a/wscript +++ b/wscript @@ -7,8 +7,11 @@ import string import subprocess import sys -# Variables for 'waf dist' -VERSION = '3.0beta5' +if sys.platform == 'darwin': + VERSION = '3.0beta6' +else: + VERSION = '3.0rc3' + APPNAME = 'Ardour3' # Mandatory variables @@ -23,6 +26,7 @@ children = [ 'libs/qm-dsp', 'libs/vamp-plugins', 'libs/taglib', + 'libs/libltc', 'libs/rubberband', 'libs/surfaces', 'libs/panners', @@ -36,7 +40,8 @@ children = [ 'export', 'midi_maps', 'mcp', - 'manual' + 'manual', + 'patchfiles' ] i18n_children = [ @@ -45,18 +50,21 @@ i18n_children = [ 'libs/gtkmm2ext', ] -if sys.platform != 'darwin': +if sys.platform == 'linux2': children += [ 'tools/sanity_check' ] lxvst_default = True -else: +elif sys.platform == 'darwin': children += [ 'libs/appleutility' ] lxvst_default = False +else: + lxvst_default = False # Version stuff def fetch_svn_revision (path): - cmd = "LANG= svn info " + path + " | awk '/^Revision:/ { print $2}'" - return subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines() + cmd = "svnversion | cut -d: -f1" + output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].decode (sys.getdefaultencoding()) + return output.rstrip(os.linesep) def fetch_gcc_version (CC): cmd = "LANG= %s --version" % CC @@ -66,10 +74,12 @@ def fetch_gcc_version (CC): return version def fetch_git_revision (path): - cmd = "LANG= git log --abbrev HEAD^..HEAD " + path + cmd = "LANG= git log --abbrev HEAD^..HEAD" output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines() o = output[0].decode('utf-8') rev = o.replace ("commit", "git")[0:10] + cmd = "LANG= git log --abbrev -n1 --grep 'git-svn-id'" + output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines() for line in output: try: if "git-svn-id" in line: @@ -107,7 +117,7 @@ def create_stored_revision(): try: text = '#include "ardour/svn_revision.h"\n' text += 'namespace ARDOUR { const char* svn_revision = \"%s\"; }\n' % rev - print('Writing svn revision info to libs/ardour/svn_revision.cc') + print('Writing svn revision info to libs/ardour/svn_revision.cc using ' + rev) o = open('libs/ardour/svn_revision.cc', 'w') o.write(text) o.close() @@ -162,7 +172,7 @@ def set_compiler_flags (conf,opt): else: conf.env['build_target'] = opt.dist_target - if conf.env['build_target'] = 'snowleopard': + if conf.env['build_target'] == 'snowleopard': # # stupid OS X 10.6 has a bug in math.h that prevents llrint and friends # from being visible. @@ -392,6 +402,8 @@ def options(opt): 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('--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', help='Specify the target for cross-compiling [auto,none,x86,i386,i686,x86_64,powerpc,tiger,leopard]') opt.add_option('--fpu-optimization', action='store_true', default=True, dest='fpu_optimization', @@ -435,8 +447,6 @@ def options(opt): help='Add revision information to executable name inside the build directory') 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><\'') @@ -472,29 +482,34 @@ def configure(conf): print('Please use a different version or re-configure with --debug') exit (1) - # libintl may or may not be trivially locatable. On OS X this is always - # true. On Linux it will depend on whether we're on a normal Linux distro, - # in which case libintl.h is going to be available in /usr/include and - # the library itself is part of glibc, or on a bare-bones build system - # where we need to pick it up from the GTK dependency stack. + # systems with glibc have libintl builtin. systems without require explicit + # linkage against libintl. # - user_gtk_root = os.path.expanduser ('~/gtk/inst') + pkg_config_path = os.getenv('PKG_CONFIG_PATH') - if not os.path.isfile ('/usr/include/libintl.h') or (pkg_config_path is not None and pkg_config_path.find (user_gtk_root) >= 0): - # XXXX hack hack hack + user_gtk_root = os.path.expanduser (Options.options.depstack_root + '/gtk/inst') + + if pkg_config_path is not None and pkg_config_path.find (user_gtk_root) >= 0: + # told to search user_gtk_root prefinclude = ''.join ([ '-I', user_gtk_root + '/include']) preflib = ''.join ([ '-L', user_gtk_root + '/lib']) conf.env.append_value('CFLAGS', [ prefinclude ]) conf.env.append_value('CXXFLAGS', [prefinclude ]) conf.env.append_value('LINKFLAGS', [ preflib ]) + autowaf.display_msg(conf, 'Will build against private GTK dependency stack in ' + user_gtk_root, 'yes') + else: + autowaf.display_msg(conf, 'Will build against private GTK dependency stack', 'no') + + if sys.platform == 'darwin': conf.define ('NEED_INTL', 1) autowaf.display_msg(conf, 'Will use explicit linkage against libintl in ' + user_gtk_root, 'yes') else: - autowaf.display_msg(conf, 'Will use explicit linkage against libintl in ', 'no') - - user_ardour_root = os.path.expanduser ('~/a3/inst') - if pkg_config_path is not None and os.getenv('PKG_CONFIG_PATH').find (user_ardour_root) >= 0: - # XXXX hack hack hack + # libintl is part of the system, so use it + autowaf.display_msg(conf, 'Will rely on libintl built into libc', 'yes') + + user_ardour_root = os.path.expanduser (Options.options.depstack_root + '/a3/inst') + if pkg_config_path is not None and pkg_config_path.find (user_ardour_root) >= 0: + # told to search user_ardour_root prefinclude = ''.join ([ '-I', user_ardour_root + '/include']) preflib = ''.join ([ '-L', user_ardour_root + '/lib']) conf.env.append_value('CFLAGS', [ prefinclude ]) @@ -503,7 +518,7 @@ def configure(conf): autowaf.display_msg(conf, 'Will build against private Ardour dependency stack in ' + user_ardour_root, 'yes') else: autowaf.display_msg(conf, 'Will build against private Ardour dependency stack', 'no') - + if sys.platform == 'darwin': # this is required, potentially, for anything we link and then relocate into a bundle @@ -599,7 +614,7 @@ def configure(conf): 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') - conf.check_cc(function_name='dlopen', header_name='dlfcn.h', linkflags='-ldl', uselib_store='DL') + conf.check_cc(function_name='dlopen', header_name='dlfcn.h', lib='dl', uselib_store='DL') # Tell everyone that this is a waf build @@ -635,9 +650,6 @@ def configure(conf): conf.env['LXVST_SUPPORT'] = True if bool(conf.env['JACK_SESSION']): conf.define('HAVE_JACK_SESSION', 1) - if opts.wiimote: - conf.define('WIIMOTE', 1) - conf.env['WIIMOTE'] = True conf.define('WINDOWS_KEY', opts.windows_key) conf.env['PROGRAM_NAME'] = opts.program_name if opts.rt_alloc_debug: @@ -706,7 +718,7 @@ const char* const ardour_config_info = "\\n\\ write_config_text('Universal binary', opts.universal) write_config_text('Generic x86 CPU', opts.generic) write_config_text('Windows VST support', opts.windows_vst) - write_config_text('Wiimote support', opts.wiimote) + write_config_text('Wiimote support', conf.is_defined('BUILD_WIIMOTE')) write_config_text('Windows key', opts.windows_key) write_config_text('C compiler flags', conf.env['CFLAGS']) @@ -726,6 +738,7 @@ def build(bld): 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')