diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-02-18 22:27:39 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-02-18 22:27:39 +0100 |
| commit | 0d8f1bf986b3b28782403c410d745a3b421dbe00 (patch) | |
| tree | fb18d7aa7f2f9976f9fc5e341b33d2456171e2dd | |
| parent | dae29c48ed404f8692ac050500937c0f36cd8e47 (diff) | |
Regrettably revert the optimisation preventing lots of pointless Linux builds.fix-tests
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.
| -rw-r--r-- | cscript | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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') |
