Regrettably revert the optimisation preventing lots of pointless Linux builds. fix-tests
authorCarl Hetherington <cth@carlh.net>
Fri, 18 Feb 2022 21:27:39 +0000 (22:27 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 18 Feb 2022 21:27:39 +0000 (22:27 +0100)
This was changed in 17e4118de4614ef0358bdcf4d7715f1a7c85d67e
to not (pointlessly) build DoM when the packaging step would do it again.
This, of course, breaks tests on Linux.

There seems to be a few ways round this but nothing neat and simple
enough to do at this point.

cscript

diff --git a/cscript b/cscript
index 4cbec58cfad41bba434830331f321682745eac0d..330fff88df2fcfa4e61a4af3cb050cce4078c0fe 100644 (file)
--- a/cscript
+++ b/cscript
@@ -569,8 +569,7 @@ def build(target, options):
         with open('build/com.dcpomatic.DCP-o-matic.json', 'w') as outfile:
             json.dump(desc, outfile)
         target.command('%s --repo=build/platform/repo build/platform/flatpak build/com.dcpomatic.DCP-o-matic.json' % target.flatpak_builder())
-    elif target.platform != "linux" or target.detail == 'appimage':
-        # Build here if the packaging step won't do it
+    else:
         target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target, options)))
         target.command('./waf')
         target.command('./waf install')