From 0d8f1bf986b3b28782403c410d745a3b421dbe00 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 18 Feb 2022 22:27:39 +0100 Subject: [PATCH] Regrettably revert the optimisation preventing lots of pointless Linux builds. 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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cscript b/cscript index 4cbec58cf..330fff88d 100644 --- 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') -- 2.30.2