qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Yonggang Luo <luoyonggang@gmail.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
	Yonggang Luo <luoyonggang@gmail.com>
Subject: [PATCH v4 1/4] docs: Fixes build docs on msys2/mingw
Date: Fri, 16 Oct 2020 06:06:23 +0800	[thread overview]
Message-ID: <20201015220626.418-2-luoyonggang@gmail.com> (raw)
In-Reply-To: <20201015220626.418-1-luoyonggang@gmail.com>

meson didn't support running ../scripts/kernel-do directly

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
 docs/conf.py             | 2 +-
 docs/sphinx/kerneldoc.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 00e1b750e2..e584f68393 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -241,7 +241,7 @@ texinfo_documents = [
 # We use paths starting from qemu_docdir here so that you can run
 # sphinx-build from anywhere and the kerneldoc extension can still
 # find everything.
-kerneldoc_bin = os.path.join(qemu_docdir, '../scripts/kernel-doc')
+kerneldoc_bin = ['perl', os.path.join(qemu_docdir, '../scripts/kernel-doc')]
 kerneldoc_srctree = os.path.join(qemu_docdir, '..')
 hxtool_srctree = os.path.join(qemu_docdir, '..')
 qapidoc_srctree = os.path.join(qemu_docdir, '..')
diff --git a/docs/sphinx/kerneldoc.py b/docs/sphinx/kerneldoc.py
index 3e87940206..3ac277d162 100644
--- a/docs/sphinx/kerneldoc.py
+++ b/docs/sphinx/kerneldoc.py
@@ -67,7 +67,7 @@ class KernelDocDirective(Directive):
 
     def run(self):
         env = self.state.document.settings.env
-        cmd = [env.config.kerneldoc_bin, '-rst', '-enable-lineno']
+        cmd = env.config.kerneldoc_bin + ['-rst', '-enable-lineno']
 
         filename = env.config.kerneldoc_srctree + '/' + self.arguments[0]
         export_file_patterns = []
-- 
2.28.0.windows.1



  reply	other threads:[~2020-10-15 22:08 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-15 22:06 [PATCH v4 0/4] Fixes docs building on msys2/mingw Yonggang Luo
2020-10-15 22:06 ` Yonggang Luo [this message]
2020-10-15 22:19   ` [PATCH v4 1/4] docs: Fixes build docs " Paolo Bonzini
2020-10-16  3:07     ` 罗勇刚(Yonggang Luo)
2020-10-15 22:06 ` [PATCH v4 2/4] configure: the docdir option should passed to meson as is Yonggang Luo
2020-10-15 22:06 ` [PATCH v4 3/4] meson: Move the detection logic for sphinx to meson Yonggang Luo
2020-10-16  7:46   ` Paolo Bonzini
2020-10-16  7:52     ` 罗勇刚(Yonggang Luo)
2020-10-16  7:57       ` Paolo Bonzini
2020-10-16  7:58         ` 罗勇刚(Yonggang Luo)
2020-10-16  7:58         ` 罗勇刚(Yonggang Luo)
2020-10-16  8:05         ` Paolo Bonzini
2020-10-16  8:12           ` 罗勇刚(Yonggang Luo)
2020-10-15 22:06 ` [PATCH v4 4/4] cirrus: Enable doc build on msys2/mingw Yonggang Luo

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=20201015220626.418-2-luoyonggang@gmail.com \
    --to=luoyonggang@gmail.com \
    --cc=pbonzini@redhat.com \
    --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).