X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=433f1a6f3c10d14e5a6af3f026a50f90045f9ffc;hb=d79e3a21c6fd34a4994a20431cf2566f9405e024;hp=426dc1d47ab319abe489d728406c7267d0cf8d09;hpb=ba73a77c6358ffc418dc726c0977239decf401b6;p=ardour.git diff --git a/wscript b/wscript index 426dc1d47a..433f1a6f3c 100644 --- a/wscript +++ b/wscript @@ -15,8 +15,8 @@ if sys.platform == 'darwin': OSX_VERSION = '3.0beta6' VERSION = '3.0beta6' else: - LINUX_VERSION = '3.0rc3' - VERSION = '3.0rc3' + LINUX_VERSION = '3.1' + VERSION = '3.1' APPNAME = 'Ardour3' @@ -42,11 +42,9 @@ children = [ 'libs/clearlooks-newer', 'libs/audiographer', 'gtk2_ardour', - 'templates', 'export', 'midi_maps', 'mcp', - 'manual', 'patchfiles' ] @@ -67,11 +65,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.getdefaultencoding()) - 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() @@ -79,56 +72,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" - 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) - 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 using ' + rev) - 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): @@ -435,6 +405,12 @@ 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('--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', @@ -598,6 +574,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) @@ -626,6 +606,7 @@ 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', lib='dl', uselib_store='DL') @@ -636,8 +617,6 @@ def configure(conf): # Set up waf environment and C defines opts = Options.options - print "PH = " - print opts.phone_home if opts.phone_home: conf.define('PHONE_HOME', 1) conf.env['PHONE_HOME'] = True @@ -653,6 +632,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 @@ -702,6 +684,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')) @@ -730,6 +713,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')) @@ -778,3 +762,5 @@ def i18n_po(bld): def i18n_mo(bld): bld.recurse (i18n_children) +def tarball(bld): + create_stored_revision()