Bump version

[libdcp.git] / wscript

diff --git a/wscript b/wscript
index c6b69e86f2f7cfacab5e6f4ba37dd17b7b529f89..5478dd9e4b08da7d521019c65260a290918f9cbd 100644 (file)
--- a/wscript
+++ b/wscript
@@ -2,9 +2,10 @@ import subprocess
 import os
 import sys
 import distutils.spawn
+from waflib import Logs
 
 APPNAME = 'libdcp'
-VERSION = '1.2.6devel'
+VERSION = '1.2.10'
 API_VERSION = '-1.0'
 
 def options(opt):
@@ -13,6 +14,7 @@ def options(opt):
     opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation')
     opt.add_option('--static', action='store_true', default=False, help='build libdcp and in-tree dependencies statically, and link statically to openjpeg and cxml')
     opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests')
+    opt.add_option('--disable-gcov', action='store_true', default=False, help='don''t use gcov in tests')
     opt.add_option('--disable-examples', action='store_true', default=False, help='disable building of examples')
 
 def configure(conf):
@@ -63,12 +65,12 @@ def configure(conf):
                      }
                      """,
                        msg='Checking for library openjpeg', stlib='openjpeg', uselib_store='OPENJPEG', mandatory=True)
-        
+
         conf.env.HAVE_CXML = 1
         conf.env.STLIB_CXML = ['cxml']
     else:
         conf.check_cfg(package='libopenjpeg', args='--cflags --libs', uselib_store='OPENJPEG', mandatory=True)
-        conf.check_cfg(package='libcxml', atleast_version='0.08', args='--cflags --libs', uselib_store='CXML', mandatory=True)
+        conf.check_cfg(package='libcxml', atleast_version='0.14.0', args='--cflags --libs', uselib_store='CXML', mandatory=True)
 
     if conf.options.target_windows:
         boost_lib_suffix = '-mt'
@@ -121,7 +123,8 @@ def configure(conf):
 
     if not conf.env.DISABLE_TESTS:
         conf.recurse('test')
-        conf.check(lib='gcov', define_name='HAVE_GCOV', mandatory=False)
+        if not conf.options.disable_gcov:
+            conf.check(lib='gcov', define_name='HAVE_GCOV', mandatory=False)
     conf.recurse('asdcplib')
 
 def build(bld):
@@ -168,7 +171,7 @@ def create_version_cc(bld, version):
             debug_string = 'true'
         else:
             debug_string = 'false'
-        text += 'bool const built_with_debug = %s;\n' % debug_string
+        text += 'bool const dcp::built_with_debug = %s;\n' % debug_string
         print('Writing version information to src/version.cc')
         o = open('src/version.cc', 'w')
         o.write(text)
@@ -180,3 +183,6 @@ def create_version_cc(bld, version):
 def post(ctx):
     if ctx.cmd == 'install':
         ctx.exec_command('/sbin/ldconfig')
+
+def tags(bld):
+    os.system('etags src/*.cc src/*.h')