Try to fix occasional test failure.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index 31b012be6da48c29fd685e97841e9d4bf803fbb2..561097917ca353375bdeffb5c109ff81bc0929c3 100644 (file)
--- a/wscript
+++ b/wscript
@@ -40,7 +40,7 @@ last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), s
 if this_version == '':
     VERSION = '%sdevel' % last_version[1:].strip()
 else:
-VERSION = '2.13.73'
+    VERSION = this_version[1:].strip()
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -99,6 +99,7 @@ def configure(conf):
                                        # Remove auto_ptr warnings from libxml++-2.6
                                        '-Wno-deprecated-declarations',
                                        '-Wno-ignored-qualifiers',
+                                       '-Wno-parentheses',
                                        '-D_FILE_OFFSET_BITS=64'])
 
     if conf.options.force_cpp11:
@@ -619,8 +620,16 @@ def create_version_cc(version, cxx_flags):
         sys.exit(-1)
 
 def post(ctx):
-    if ctx.cmd == 'install':
+    if ctx.cmd == 'install' and ctx.env.TARGET_LINUX:
         ctx.exec_command('/sbin/ldconfig')
+        # I can't find anything which tells me where things have been installed to,
+        # so here's some nasty hacks to guess.
+        debian = os.path.join(ctx.out_dir, '../debian/dcpomatic/usr/bin/dcpomatic2_uuid')
+        prefix = os.path.join(ctx.env['INSTALL_PREFIX'], 'bin/dcpomatic2_uuid')
+        if os.path.exists(debian):
+            os.chmod(debian, 0o4755)
+        if os.path.exists(prefix):
+            os.chmod(prefix, 0o4755)
 
 def pot(bld):
     bld.recurse('src')