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 03/11] docs/sphinx: add templates files to generated depfile
Date: Fri, 5 Nov 2021 17:32:14 +0400 [thread overview]
Message-ID: <20211105133222.184722-4-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <20211105133222.184722-1-marcandre.lureau@redhat.com>
From: Marc-André Lureau <marcandre.lureau@redhat.com>
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/conf.py | 2 +-
docs/sphinx/depfile.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index ff6e92c6e2e6..edc2bf8fcba7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -74,7 +74,7 @@
extensions = ['kerneldoc', 'qmp_lexer', 'hxtool', 'depfile', 'qapidoc']
# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = [os.path.join(qemu_docdir, '_templates')]
# The suffix(es) of source filenames.
# You can specify multiple suffix as a list of string:
diff --git a/docs/sphinx/depfile.py b/docs/sphinx/depfile.py
index 99539adb4892..afdcbcec6e76 100644
--- a/docs/sphinx/depfile.py
+++ b/docs/sphinx/depfile.py
@@ -27,7 +27,7 @@ def get_infiles(env):
if mod.__file__:
yield mod.__file__
# this is perhaps going to include unused files:
- for static_path in env.config.html_static_path:
+ for static_path in env.config.html_static_path + env.config.templates_path:
for path in Path(static_path).rglob('*'):
yield str(path)
--
2.33.0.721.g106298f7f9
next prev parent reply other threads:[~2021-11-05 13:38 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-05 13:32 [PULL 00/11] Sphinx patches marcandre.lureau
2021-11-05 13:32 ` [PULL 01/11] docs/sphinx: add loaded modules to generated depfile marcandre.lureau
2021-11-05 13:32 ` [PULL 02/11] docs/sphinx: add static files " marcandre.lureau
2021-11-05 13:32 ` marcandre.lureau [this message]
2021-11-05 13:32 ` [PULL 04/11] tests/qapi-schema/meson: add depfile to sphinx doc marcandre.lureau
2021-11-05 13:32 ` [PULL 05/11] meson: drop sphinx_extn_depends marcandre.lureau
2021-11-05 13:32 ` [PULL 06/11] meson: drop sphinx_template_files marcandre.lureau
2021-11-05 13:32 ` [PULL 07/11] docs/sphinx: set navigation_with_keys=True marcandre.lureau
2021-11-05 13:32 ` [PULL 08/11] docs/sphinx: add 's' keyboard binding to focus search marcandre.lureau
2021-11-05 13:32 ` [PULL 09/11] docs: remove non-reference uses of single backticks marcandre.lureau
2021-11-05 13:32 ` [PULL 10/11] docs: (further) " marcandre.lureau
2021-11-05 13:32 ` [PULL 11/11] docs/sphinx: change default role to "any" marcandre.lureau
2021-11-05 18:07 ` [PULL 00/11] Sphinx patches Richard Henderson
2021-11-08 8:49 ` Marc-André Lureau
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=20211105133222.184722-4-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).