X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=794c2f1124b67332868aed2ae44595b6ddc2353f;hb=e1f3dcee2a7a8233b6f3306763a7e7bce787bb4c;hp=558eb177db174cbecccdf50cdee3cab58960014c;hpb=9bbed5925d338cc0ff1ecc2b07b94da84547bf94;p=ardour.git diff --git a/wscript b/wscript index 558eb177db..794c2f1124 100644 --- a/wscript +++ b/wscript @@ -7,8 +7,17 @@ import string import subprocess import sys -# Variables for 'waf dist' -VERSION = '3.0rc2' +# +# build scripts need to find the right platform specific version +# + +if sys.platform == 'darwin': + OSX_VERSION = '3.0beta6' + VERSION = '3.0beta6' +else: + LINUX_VERSION = '3.0' + VERSION = '3.0' + APPNAME = 'Ardour3' # Mandatory variables @@ -37,7 +46,6 @@ children = [ 'export', 'midi_maps', 'mcp', - 'manual', 'patchfiles' ] @@ -58,11 +66,6 @@ else: # Version stuff -def fetch_svn_revision (path): - cmd = "svnversion | cut -d: -f1" - output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].decode(sys.stdout.encoding) - return output.rstrip(os.linesep) - 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() @@ -70,40 +73,17 @@ def fetch_gcc_version (CC): version = o.split(' ')[2].split('.') return version -def fetch_git_revision (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'" +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() - 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) + if os.path.exists('.git'): + rev = fetch_git_revision(); + print("ardour.git version: " + rev + "\n") elif os.path.exists('libs/ardour/svn_revision.cc'): print("Using packaged svn revision") return @@ -114,7 +94,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 using ' + rev) + print('Writing revision info to libs/ardour/svn_revision.cc using ' + rev) o = open('libs/ardour/svn_revision.cc', 'w') o.write(text) o.close() @@ -155,8 +135,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' @@ -272,12 +254,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) @@ -399,6 +391,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', @@ -412,6 +406,8 @@ 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('--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', @@ -421,7 +417,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', @@ -477,39 +476,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 os.path.isfile ('/usr/include/libintl.h'): - # libintl is part of the system., so use it - autowaf.display_msg(conf, 'Will reply on libintl built into libc', 'yes') + 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: - if (pkg_config_path is not None): - # told to search for pkgconfig files - if 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 ]) - conf.define ('NEED_INTL', 1) - autowaf.display_msg(conf, 'Will use explicit linkage against libintl in ' + user_gtk_root, 'yes') - else: - print ('\n\n**** Cannot locate libintl.h and PKG_CONFIG_PATH does not include ', user_gtk_root, '- this needs fixing before the build can continue') - sys.exit (-1) - else: - print ('\n\n**** Cannot locate libintl.h and PKG_CONFIG_PATH is not set - this needs fixing before the build can continue') + 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: + # 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 ('~/a3/inst') - if pkg_config_path is not None and os.getenv('PKG_CONFIG_PATH').find (user_ardour_root) >= 0: - # XXXX hack hack hack + 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 ]) @@ -518,7 +512,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 @@ -534,14 +528,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. @@ -623,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: @@ -639,6 +624,9 @@ def configure(conf): conf.env['BUILD_TESTS'] = opts.build_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 @@ -716,6 +704,7 @@ 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')) @@ -764,3 +753,5 @@ def i18n_po(bld): def i18n_mo(bld): bld.recurse (i18n_children) +def tarball(bld): + create_stored_revision()