All of lore.kernel.org
 help / color / mirror / Atom feed
From: marcandre.lureau@redhat.com
To: qemu-devel@nongnu.org
Cc: "John Snow" <jsnow@redhat.com>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [PULL v2 05/11] meson: drop sphinx_extn_depends
Date: Mon,  8 Nov 2021 13:01:49 +0400	[thread overview]
Message-ID: <20211108090155.371357-6-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <20211108090155.371357-1-marcandre.lureau@redhat.com>

From: Marc-André Lureau <marcandre.lureau@redhat.com>

Module dependencies is now handled by depfile.py.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
---
 docs/meson.build              | 9 +--------
 tests/qapi-schema/meson.build | 1 -
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/docs/meson.build b/docs/meson.build
index 19cce670a20d..34fda6853d9e 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -37,13 +37,6 @@ endif
 if build_docs
   SPHINX_ARGS += ['-Dversion=' + meson.project_version(), '-Drelease=' + config_host['PKGVERSION']]
 
-  sphinx_extn_depends = [ meson.current_source_dir() / 'sphinx/depfile.py',
-                          meson.current_source_dir() / 'sphinx/hxtool.py',
-                          meson.current_source_dir() / 'sphinx/kerneldoc.py',
-                          meson.current_source_dir() / 'sphinx/kernellog.py',
-                          meson.current_source_dir() / 'sphinx/qapidoc.py',
-                          meson.current_source_dir() / 'sphinx/qmp_lexer.py',
-                          qapi_gen_depends ]
   sphinx_template_files = [ meson.project_source_root() / 'docs/_templates/footer.html' ]
 
   have_ga = have_tools and config_host.has_key('CONFIG_GUEST_AGENT')
@@ -77,7 +70,7 @@ if build_docs
                 output: 'docs.stamp',
                 input: files('conf.py'),
                 depfile: 'docs.d',
-                depend_files: [ sphinx_extn_depends, sphinx_template_files ],
+                depend_files: [ sphinx_template_files ],
                 command: [SPHINX_ARGS, '-Ddepfile=@DEPFILE@',
                           '-Ddepfile_stamp=@OUTPUT0@',
                           '-b', 'html', '-d', private_dir,
diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build
index d91d972af25e..caf0791ba84a 100644
--- a/tests/qapi-schema/meson.build
+++ b/tests/qapi-schema/meson.build
@@ -241,7 +241,6 @@ if build_docs
                                output: ['doc-good.txt'],
                                input: files('doc-good.json', 'doc-good.rst'),
                                build_by_default: true,
-                               depend_files: sphinx_extn_depends,
                                depfile: 'docs.d',
                                # We use -E to suppress Sphinx's caching, because
                                # we want it to always really run the QAPI doc
-- 
2.33.0.721.g106298f7f9



  parent reply	other threads:[~2021-11-08  9:08 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-08  9:01 [PULL v2 00/11] Sphinx patches marcandre.lureau
2021-11-08  9:01 ` [PULL v2 01/11] docs/sphinx: add loaded modules to generated depfile marcandre.lureau
2021-11-08  9:01 ` [PULL v2 02/11] docs/sphinx: add static files " marcandre.lureau
2021-11-08  9:01 ` [PULL v2 03/11] docs/sphinx: add templates " marcandre.lureau
2021-11-08  9:01 ` [PULL v2 04/11] tests/qapi-schema/meson: add depfile to sphinx doc marcandre.lureau
2021-11-08  9:01 ` marcandre.lureau [this message]
2021-11-08  9:01 ` [PULL v2 06/11] meson: drop sphinx_template_files marcandre.lureau
2021-11-08  9:01 ` [PULL v2 07/11] docs/sphinx: set navigation_with_keys=True marcandre.lureau
2021-11-08  9:01 ` [PULL v2 08/11] docs/sphinx: add 's' keyboard binding to focus search marcandre.lureau
2021-11-08  9:01 ` [PULL v2 09/11] docs: remove non-reference uses of single backticks marcandre.lureau
2021-11-08  9:01 ` [PULL v2 10/11] docs: (further) " marcandre.lureau
2021-11-08  9:01 ` [PULL v2 11/11] docs/sphinx: change default role to "any" marcandre.lureau
2021-11-08 15:22 ` [PULL v2 00/11] Sphinx patches Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211108090155.371357-6-marcandre.lureau@redhat.com \
    --to=marcandre.lureau@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.