Bump version

[libdcp.git] / wscript

diff --git a/wscript b/wscript
index dab2ced0ec29447c6361ae7ea6f195db91d2c002..ae56c77cb0379b63fb4ebbe1d44b01bf32d0c7da 100644 (file)
--- a/wscript
+++ b/wscript
@@ -1,14 +1,15 @@
 import subprocess
 import os
-import lut
 
 APPNAME = 'libdcp'
-VERSION = '0.32pre'
+VERSION = '0.43'
 
 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('--enable-debug', action='store_true', default = False, help = 'build with debugging information and without optimisation')
+    opt.add_option('--static-openjpeg', action='store_true', default = False, help = 'link statically to openjpeg')
+    opt.add_option('--static-libdcp', action='store_true', default = False, help = 'build libdcp and in-tree dependencies statically')
 
 def configure(conf):
     conf.load('compiler_cxx')
@@ -16,6 +17,9 @@ def configure(conf):
     conf.env.append_value('CXXFLAGS', ['-DLIBDCP_VERSION="%s"' % VERSION])
 
     conf.env.TARGET_WINDOWS = conf.options.target_windows
+    conf.env.STATIC_OPENJPEG = conf.options.static_openjpeg
+    conf.env.STATIC_LIBDCP = conf.options.static_libdcp
+    conf.env.ENABLE_DEBUG = conf.options.enable_debug
 
     if conf.options.target_windows:
         conf.env.append_value('CXXFLAGS', '-DLIBDCP_WINDOWS')
@@ -24,15 +28,19 @@ def configure(conf):
 
     conf.check_cfg(package = 'openssl', args = '--cflags --libs', uselib_store = 'OPENSSL', mandatory = True)
     conf.check_cfg(package = 'libxml++-2.6', args = '--cflags --libs', uselib_store = 'LIBXML++', mandatory = True)
-
-    conf.check_cc(fragment  = """
-                             #include <stdio.h>\n
-                             #include <openjpeg.h>\n
-                             int main () {\n
-                             void* p = (void *) opj_image_create;\n
-                             return 0;\n
-                             }
-                             """, msg = 'Checking for library openjpeg', lib = 'openjpeg', uselib_store = 'OPENJPEG')
+    if conf.options.static_openjpeg:
+
+        conf.check_cc(fragment = """
+                       #include <stdio.h>\n
+                       #include <openjpeg.h>\n
+                       int main () {\n
+                       void* p = (void *) opj_image_create;\n
+                       return 0;\n
+                       }
+                       """,
+                       msg = 'Checking for library openjpeg', stlib = 'openjpeg', uselib_store = 'OPENJPEG', mandatory = True)
+    else:
+        conf.check_cfg(package = 'libopenjpeg', args = '--cflags --libs', uselib_store = 'OPENJPEG', mandatory = True)
 
     if conf.options.target_windows:
         boost_lib_suffix = '-mt'
@@ -42,7 +50,21 @@ def configure(conf):
     if conf.options.enable_debug:
         conf.env.append_value('CXXFLAGS', '-g')
     else:
-        conf.env.append_value('CXXFLAGS', '-O3')
+        # Somewhat experimental use of -O2 rather than -O3 to see if
+        # Windows builds are any more reliable
+        conf.env.append_value('CXXFLAGS', '-O2')
+
+    conf.check_cxx(fragment = """
+                              #include <boost/version.hpp>\n
+                              #if BOOST_VERSION < 104500\n
+                              #error boost too old\n
+                              #endif\n
+                              int main(void) { return 0; }\n
+                              """,
+                   mandatory = True,
+                   msg = 'Checking for boost library >= 1.45',
+                   okmsg = 'yes',
+                   errmsg = 'too old\nPlease install boost version 1.45 or higher.')
 
     conf.check_cxx(fragment = """
                              #include <boost/filesystem.hpp>\n
@@ -60,13 +82,11 @@ def configure(conf):
                    msg = 'Checking for boost signals2 library',
                    uselib_store = 'BOOST_SIGNALS2')
 
-    lut.make_luts()
-
     conf.recurse('test')
     conf.recurse('asdcplib')
 
 def build(bld):
-    create_version_cc(VERSION)
+    create_version_cc(bld, VERSION)
 
     if bld.env.TARGET_WINDOWS:
         boost_lib_suffix = '-mt'
@@ -76,7 +96,7 @@ def build(bld):
     bld(source = 'libdcp.pc.in',
         version = VERSION,
         includedir = '%s/include' % bld.env.PREFIX,
-        libs = "-L${libdir} -ldcp -lkumu-libdcp -lasdcp-libdcp -lboost_system%s" % boost_lib_suffix,
+        libs = "-L${libdir} -ldcp -lasdcp-libdcp -lkumu-libdcp -lboost_system%s" % boost_lib_suffix,
         install_path = '${LIBDIR}/pkgconfig')
 
     bld.recurse('src')
@@ -88,9 +108,9 @@ def build(bld):
     bld.add_post_fun(post)
 
 def dist(ctx):
-    ctx.excl = 'TODO core *~ .git build .waf* .lock* doc/*~ src/*~ test/ref/*~'
+    ctx.excl = 'TODO core *~ .git build .waf* .lock* doc/*~ src/*~ test/ref/*~ __pycache__ GPATH GRTAGS GSYMS GTAGS'
 
-def create_version_cc(version):
+def create_version_cc(bld, version):
     if os.path.exists('.git'):
         cmd = "LANG= git log --abbrev HEAD^..HEAD ."
         output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
@@ -103,6 +123,11 @@ def create_version_cc(version):
         text =  '#include "version.h"\n'
         text += 'char const * libdcp::git_commit = \"%s\";\n' % commit
         text += 'char const * libdcp::version = \"%s\";\n' % version
+        if bld.env.ENABLE_DEBUG:
+            debug_string = 'true'
+        else:
+            debug_string = 'false'
+        text += 'bool const built_with_debug = %s;\n' % debug_string
         print('Writing version information to src/version.cc')
         o = open('src/version.cc', 'w')
         o.write(text)