Return null if deserializing an export timespan doesn't succeed with at least one...

[ardour.git] / wscript

diff --git a/wscript b/wscript
index 57929acad4857b38c42dc99ffe545c234e851949..93f2912edb9beaae81f23bb62f8777b421faae62 100644 (file)
--- a/wscript
+++ b/wscript
@@ -7,16 +7,7 @@ import string
 import subprocess
 import sys
 
-#
-# 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'
+VERSION = '3.1'
 
 APPNAME = 'Ardour3'
 
@@ -42,7 +33,6 @@ children = [
         'libs/clearlooks-newer',
         'libs/audiographer',
         'gtk2_ardour',
-        'templates',
         'export',
         'midi_maps',
         'mcp',
@@ -66,11 +56,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()
@@ -78,56 +63,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):
@@ -434,6 +396,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',
@@ -597,6 +563,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)
 
@@ -625,6 +595,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')
 
@@ -699,6 +670,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'))