From ed8d95182bc994e31e730c59e1c8bfec4822b27d Mon Sep 17 00:00:00 2001 From: Fabiano Rosas Date: Wed, 3 May 2023 17:39:46 -0300 Subject: meson: Pass -j option to sphinx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Save a bit of build time by passing the number of jobs option to sphinx. We cannot use the -j option from make because meson does not support setting build time parameters for custom targets. Use nproc instead or the equivalent sphinx option "-j auto", if that is available (version >=1.7.0). Also make sure our plugins support parallelism and report it properly to sphinx. Particularly, implement the merge_domaindata method in DBusDomain that is used to merge in data from other subprocesses. Tested-by: Daniel P. Berrangé Signed-off-by: Fabiano Rosas Message-Id: <20230503203947.3417-2-farosas@suse.de> Signed-off-by: Paolo Bonzini --- docs/sphinx/dbusdomain.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/sphinx/dbusdomain.py') diff --git a/docs/sphinx/dbusdomain.py b/docs/sphinx/dbusdomain.py index 2ea95af623..9872fd5bf6 100644 --- a/docs/sphinx/dbusdomain.py +++ b/docs/sphinx/dbusdomain.py @@ -400,6 +400,10 @@ class DBusDomain(Domain): for refname, obj in self.objects.items(): yield (refname, refname, obj.objtype, obj.docname, obj.node_id, 1) + def merge_domaindata(self, docnames, otherdata): + for name, obj in otherdata['objects'].items(): + if obj.docname in docnames: + self.data['objects'][name] = obj def setup(app): app.add_domain(DBusDomain) -- cgit 1.4.1