Try to ensure that recover tests happen in order, to hopefully fix seemingly-random...

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index 16c3ef9793cafe37dafd186a0dd628f2bbcf5ae9..561097917ca353375bdeffb5c109ff81bc0929c3 100644 (file)
--- a/wscript
+++ b/wscript
@@ -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:
@@ -621,7 +622,14 @@ def create_version_cc(version, cxx_flags):
 def post(ctx):
     if ctx.cmd == 'install' and ctx.env.TARGET_LINUX:
         ctx.exec_command('/sbin/ldconfig')
-        os.chmod(os.path.join(ctx.env.PREFIX, 'bin/dcpomatic2_uuid'), 0o4755)
+        # 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')