Bump version

[libdcp.git] / wscript

diff --git a/wscript b/wscript
index 38e1ac113193871c2414ad59f0e7c85c82eef859..f606955044fb8528cc38ed18212fb1937b275c1e 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import lut
 
 APPNAME = 'libdcp'
-VERSION = '0.33'
+VERSION = '0.38'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -20,6 +20,7 @@ def configure(conf):
     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')
@@ -28,19 +29,10 @@ 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)
-
-    openjpeg_fragment = """
-                       #include <stdio.h>\n
-                       #include <openjpeg.h>\n
-                       int main () {\n
-                       void* p = (void *) opj_image_create;\n
-                       return 0;\n
-                       }
-                       """
     if conf.options.static_openjpeg:
         conf.check_cc(fragment = openjpeg_fragment, msg = 'Checking for library openjpeg', stlib = 'openjpeg', uselib_store = 'OPENJPEG')
     else:
-        conf.check_cc(fragment = openjpeg_fragment, msg = 'Checking for library openjpeg', lib = 'openjpeg', uselib_store = 'OPENJPEG')
+        conf.check_cfg(package = 'libopenjpeg', args = '--cflags --libs', uselib_store = 'OPENJPEG', mandatory = True)
 
     if conf.options.target_windows:
         boost_lib_suffix = '-mt'
@@ -50,7 +42,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
@@ -74,7 +80,7 @@ def configure(conf):
     conf.recurse('asdcplib')
 
 def build(bld):
-    create_version_cc(VERSION)
+    create_version_cc(bld, VERSION)
 
     if bld.env.TARGET_WINDOWS:
         boost_lib_suffix = '-mt'
@@ -96,9 +102,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__'
 
-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()
@@ -111,6 +117,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)