From: John Snow <jsnow@redhat.com>
To: "Marc-André Lureau" <marcandre.lureau@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>,
Paolo Bonzini <pbonzini@redhat.com>,
qemu-devel <qemu-devel@nongnu.org>,
Markus Armbruster <armbru@redhat.com>,
Michael Roth <michael.roth@amd.com>
Subject: Re: [PATCH v2 1/8] docs/sphinx: add loaded modules to generated depfile
Date: Tue, 26 Oct 2021 17:04:29 -0400 [thread overview]
Message-ID: <CAFn=p-by8_BkEqZk6bF6Pj2hPQ79Wdvead_Y_f1ELmfpgFUJ-Q@mail.gmail.com> (raw)
In-Reply-To: <20211015105344.152591-2-marcandre.lureau@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 1800 bytes --]
On Fri, Oct 15, 2021 at 6:57 AM <marcandre.lureau@redhat.com> wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
>
You also fix *when* the deps are generated. Small commit message blurb
would be nice.
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>
Reviewed-by: John Snow <jsnow@redhat.com>
> ---
> docs/sphinx/depfile.py | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/docs/sphinx/depfile.py b/docs/sphinx/depfile.py
> index 277fdf0f56..b6fb926df1 100644
> --- a/docs/sphinx/depfile.py
> +++ b/docs/sphinx/depfile.py
> @@ -12,6 +12,7 @@
>
> import os
> import sphinx
> +import sys
>
> __version__ = '1.0'
>
> @@ -20,8 +21,17 @@ def get_infiles(env):
> yield env.doc2path(x)
> yield from ((os.path.join(env.srcdir, dep)
> for dep in env.dependencies[x]))
> + for mod in sys.modules.values():
> + if hasattr(mod, '__file__'):
> + if mod.__file__:
> + yield mod.__file__
>
>
(How annoying that built-in modules aren't a different class and that this
attribute really is just entirely missing sometimes ...)
> -def write_depfile(app, env):
> +
> +def write_depfile(app, exception):
> + if exception:
> + return
> +
> + env = app.env
> if not env.config.depfile:
> return
>
> @@ -42,7 +52,7 @@ def write_depfile(app, env):
> def setup(app):
> app.add_config_value('depfile', None, 'env')
> app.add_config_value('depfile_stamp', None, 'env')
> - app.connect('env-updated', write_depfile)
> + app.connect('build-finished', write_depfile)
>
> return dict(
> version = __version__,
> --
> 2.33.0.721.g106298f7f9
>
>
>
[-- Attachment #2: Type: text/html, Size: 3057 bytes --]
next prev parent reply other threads:[~2021-10-26 21:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-15 10:53 [PATCH v2 0/8] Some Sphinx improvements marcandre.lureau
2021-10-15 10:53 ` [PATCH v2 1/8] docs/sphinx: add loaded modules to generated depfile marcandre.lureau
2021-10-26 21:04 ` John Snow [this message]
2021-10-15 10:53 ` [PATCH v2 2/8] docs/sphinx: add static files " marcandre.lureau
2021-10-15 10:53 ` [PATCH v2 3/8] docs/sphinx: add templates " marcandre.lureau
2021-10-15 10:53 ` [PATCH v2 4/8] tests/qapi-schema/meson: add depfile to sphinx doc marcandre.lureau
2021-10-15 10:53 ` [PATCH v2 5/8] meson: drop sphinx_extn_depends marcandre.lureau
2021-10-15 10:53 ` [PATCH v2 6/8] meson: drop sphinx_template_files marcandre.lureau
2021-10-15 10:53 ` [PATCH v2 7/8] docs/sphinx: set navigation_with_keys=True marcandre.lureau
2021-10-15 10:53 ` [PATCH v2 8/8] docs/sphinx: add 's' keyboard binding to focus search marcandre.lureau
2021-10-15 11:29 ` [PATCH v2 0/8] Some Sphinx improvements Paolo Bonzini
2021-10-26 21:10 ` John Snow
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='CAFn=p-by8_BkEqZk6bF6Pj2hPQ79Wdvead_Y_f1ELmfpgFUJ-Q@mail.gmail.com' \
--to=jsnow@redhat.com \
--cc=armbru@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=michael.roth@amd.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.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).