X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=5780b50af794c30246331b5dcb2923fa7564c3eb;hb=bebe2af95ad9999fdca719450dc2c70cfb849076;hp=6f5a6df3ccf3c957adbb676e4dc2c342e3f5cb64;hpb=1a9d9b058c74c6e73da85ee90334a087844a36b2;p=ardour.git diff --git a/wscript b/wscript index 6f5a6df3cc..5780b50af7 100644 --- a/wscript +++ b/wscript @@ -7,8 +7,8 @@ import string import subprocess import sys -# Variables for 'waf dist' -VERSION = '3.0beta5' +VERSION = '3.1' + APPNAME = 'Ardour3' # Mandatory variables @@ -23,6 +23,7 @@ children = [ 'libs/qm-dsp', 'libs/vamp-plugins', 'libs/taglib', + 'libs/libltc', 'libs/rubberband', 'libs/surfaces', 'libs/panners', @@ -31,12 +32,12 @@ children = [ 'libs/gtkmm2ext', 'libs/clearlooks-newer', 'libs/audiographer', + 'libs/canvas', 'gtk2_ardour', - 'templates', 'export', 'midi_maps', 'mcp', - 'manual' + 'patchfiles' ] i18n_children = [ @@ -45,19 +46,17 @@ 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() - def fetch_gcc_version (CC): cmd = "LANG= %s --version" % CC output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines() @@ -65,54 +64,33 @@ def fetch_gcc_version (CC): version = o.split(' ')[2].split('.') return version -def fetch_git_revision (path): - cmd = "LANG= git log --abbrev HEAD^..HEAD " + path +def fetch_git_revision (): + cmd = "LANG= git describe --tags 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] - for line in output: - try: - if "git-svn-id" in line: - line = line.split('@')[1].split(' ') - rev = line[0] - break - except: - pass + rev = output[0].decode('utf-8') return rev -def fetch_bzr_revision (path): - cmd = subprocess.Popen("LANG= bzr log -l 1 " + path, stdout=subprocess.PIPE, shell=True) - out = cmd.communicate()[0] - svn = re.search('^svn revno: [0-9]*', out, re.MULTILINE) - str = svn.group(0) - chars = 'svnreio: ' - return string.lstrip(str, chars) - def create_stored_revision(): rev = "" - if os.path.exists('.svn'): - rev = fetch_svn_revision('.'); - elif os.path.exists('.git'): - rev = fetch_git_revision('.'); - elif os.path.exists('.bzr'): - rev = fetch_bzr_revision('.'); - print("Revision: %s", rev) - elif os.path.exists('libs/ardour/svn_revision.cc'): - print("Using packaged svn revision") + if os.path.exists('.git'): + rev = fetch_git_revision(); + print("ardour.git version: " + rev + "\n") + elif os.path.exists('libs/ardour/revision.cc'): + print("Using packaged revision") return else: - print("Missing libs/ardour/svn_revision.cc. Blame the packager.") + print("Missing libs/ardour/revision.cc. Blame the packager.") sys.exit(-1) 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') - o = open('libs/ardour/svn_revision.cc', 'w') + 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) + o = open('libs/ardour/revision.cc', 'w') o.write(text) o.close() except IOError: - print('Could not open libs/ardour/svn_revision.cc for writing\n') + print('Could not open libs/ardour/revision.cc for writing\n') sys.exit(-1) def set_compiler_flags (conf,opt): @@ -148,8 +126,10 @@ def set_compiler_flags (conf,opt): conf.env['build_target'] = 'leopard' elif re.search ("^10[.]", version) != None: conf.env['build_target'] = 'snowleopard' - else: + elif re.search ("^11[.]", version) != None: conf.env['build_target'] = 'lion' + else: + conf.env['build_target'] = 'mountainlion' else: if re.search ("x86_64", cpu) != None: conf.env['build_target'] = 'x86_64' @@ -162,6 +142,14 @@ def set_compiler_flags (conf,opt): else: conf.env['build_target'] = opt.dist_target + 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. + # + debug_flags.append ('-U__STRICT_ANSI__') + optimization_flags.append ('-U__STRICT_ANSI__') + if cpu == 'powerpc' and conf.env['build_target'] != 'none': # # Apple/PowerPC optimization options @@ -257,12 +245,22 @@ def set_compiler_flags (conf,opt): # a single way to test if we're on OS X # - if conf.env['build_target'] in ['panther', 'tiger', 'leopard' ]: + if conf.env['build_target'] in ['panther', 'tiger', 'leopard', 'snowleopard' ]: 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') + + 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') else: conf.define ('IS_OSX', 0) @@ -363,6 +361,8 @@ def set_compiler_flags (conf,opt): 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') @@ -384,6 +384,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', @@ -397,6 +399,10 @@ def options(opt): 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('--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', @@ -406,7 +412,10 @@ def options(opt): 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('--phone-home', action='store_false', default=False, dest='phone_home') + opt.add_option('--phone-home', action='store_true', default=True, dest='phone_home', + help='Contact ardour.org at startup for new announcements') + opt.add_option('--no-phone-home', action='store_false', dest='phone_home', + help='Do not contact ardour.org at startup for new announcements') 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', @@ -427,8 +436,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><\'') @@ -464,29 +471,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 ]) @@ -495,7 +507,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 @@ -511,14 +523,6 @@ def configure(conf): conf.define ('TOP_MENUBAR',1) conf.define ('GTKOSX',1) - # Define OSX as a uselib to use when compiling - # on Darwin to add all applicable flags at once - # - conf.env.append_value('CXXFLAGS_OSX', '-DMAC_OS_X_VERSION_MIN_REQUIRED=1040') - conf.env.append_value('CFLAGS_OSX', '-DMAC_OS_X_VERSION_MIN_REQUIRED=1040') - conf.env.append_value('CXXFLAGS_OSX', '-mmacosx-version-min=10.4') - conf.env.append_value('CFLAGS_OSX', '-mmacosx-version-min=10.4') - # It would be nice to be able to use this to force back-compatibility with 10.4 # but even by the time of 11, the 10.4 SDK is no longer available in any normal # way. @@ -562,6 +566,10 @@ def configure(conf): else: print ('No Carbon support available for this build\n') + + if Options.options.internal_shared_libs: + conf.define('INTERNAL_SHARED_LIBS', 1) + if Options.options.boost_include != '': conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include) @@ -590,8 +598,9 @@ 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', 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 @@ -600,10 +609,9 @@ def configure(conf): # Set up waf environment and C defines opts = Options.options - if opts.debug: - opts.phone_home = False; # debug builds should not call home if opts.phone_home: - conf.env['PHONE_HOME'] = opts.phone_home + conf.define('PHONE_HOME', 1) + conf.env['PHONE_HOME'] = True if opts.fpu_optimization: conf.env['FPU_OPTIMIZATION'] = True if opts.freesound: @@ -627,9 +635,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: @@ -668,6 +673,7 @@ const char* const ardour_config_info = "\\n\\ write_config_text('Debuggable build', conf.env['DEBUG']) 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('Architecture flags', opts.arch) write_config_text('Aubio', conf.is_defined('HAVE_AUBIO')) @@ -698,7 +704,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']) @@ -718,6 +724,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') @@ -729,28 +736,7 @@ def build(bld): for i in children: bld.recurse(i) - # ideally, we'd like to use the OS-provided MIDI API - # for default ports. that doesn't work on at least - # Fedora (Nov 9th, 2009) so use JACK MIDI on linux. - - if sys.platform == 'darwin': - rc_subst_dict = { - 'MIDITAG' : 'control', - 'MIDITYPE' : 'coremidi', - 'JACK_INPUT' : 'auditioner' - } - else: - rc_subst_dict = { - 'MIDITAG' : 'control', - 'MIDITYPE' : 'jack', - 'JACK_INPUT' : 'auditioner' - } - - obj = bld(features = 'subst') - obj.source = 'ardour.rc.in' - obj.target = 'ardour_system.rc' - obj.dict = rc_subst_dict - obj.install_path = '${SYSCONFDIR}/ardour3' + bld.install_files (os.path.join(bld.env['SYSCONFDIR'], 'ardour3', ), 'ardour_system.rc') def i18n(bld): bld.recurse (i18n_children) @@ -764,3 +750,5 @@ def i18n_po(bld): def i18n_mo(bld): bld.recurse (i18n_children) +def tarball(bld): + create_stored_revision()