Bump version

[libdcp.git] / wscript

diff --git a/wscript b/wscript
index b4664a5a7892c8f913392bb4efd9f97e596e5700..5478dd9e4b08da7d521019c65260a290918f9cbd 100644 (file)
--- a/wscript
+++ b/wscript
@@ -1,17 +1,20 @@
 import subprocess
 import os
+import sys
+import distutils.spawn
+from waflib import Logs
 
 APPNAME = 'libdcp'
-VERSION = '1.00.0devel'
+VERSION = '1.2.10'
 API_VERSION = '-1.0'
 
 def options(opt):
     opt.load('compiler_cxx')
     opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile to Windows')
-    opt.add_option('--target-osx', action='store_true', default=False, help='set up to build on OS X')
     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):
@@ -20,7 +23,7 @@ def configure(conf):
     conf.env.append_value('CXXFLAGS', ['-DLIBDCP_VERSION="%s"' % VERSION])
 
     conf.env.TARGET_WINDOWS = conf.options.target_windows
-    conf.env.TARGET_OSX = conf.options.target_osx
+    conf.env.TARGET_OSX = sys.platform == 'darwin'
     conf.env.ENABLE_DEBUG = conf.options.enable_debug
     conf.env.DISABLE_TESTS = conf.options.disable_tests
     conf.env.DISABLE_EXAMPLES = conf.options.disable_examples
@@ -32,7 +35,7 @@ def configure(conf):
     else:
         conf.env.append_value('CXXFLAGS', '-DLIBDCP_POSIX')
 
-    if not conf.options.target_osx:
+    if not conf.env.TARGET_OSX:
         conf.env.append_value('CXXFLAGS', ['-Wno-unused-result', '-Wno-unused-parameter'])
 
     conf.check_cfg(package='openssl', args='--cflags --libs', uselib_store='OPENSSL', mandatory=True)
@@ -40,7 +43,16 @@ def configure(conf):
     conf.check_cfg(package='xmlsec1', args='--cflags --libs', uselib_store='XMLSEC1', mandatory=True)
     # Remove erroneous escaping of quotes from xmlsec1 defines
     conf.env.DEFINES_XMLSEC1 = [f.replace('\\', '') for f in conf.env.DEFINES_XMLSEC1]
-    conf.check_cfg(package='', path='Magick++-config', args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=False)
+
+    # ImageMagick / GraphicsMagick
+    if distutils.spawn.find_executable('Magick++-config'):
+        conf.check_cfg(package='', path='Magick++-config', args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True)
+    else:
+        image = conf.check_cfg(package='ImageMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False)
+        graphics = conf.check_cfg(package='GraphicsMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False)
+        if image is None and graphics is None:
+            Logs.pprint('RED', 'Neither ImageMagick++ nor GraphicsMagick++ found: one or the other is required')
+
     conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=False)
 
     if conf.options.static:
@@ -53,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'
@@ -111,6 +123,8 @@ def configure(conf):
 
     if not conf.env.DISABLE_TESTS:
         conf.recurse('test')
+        if not conf.options.disable_gcov:
+            conf.check(lib='gcov', define_name='HAVE_GCOV', mandatory=False)
     conf.recurse('asdcplib')
 
 def build(bld):
@@ -157,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)
@@ -169,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')