From: Bruce Richardson <bruce.richardson@intel.com>
To: bluca@debian.org
Cc: dev@dpdk.org, Bruce Richardson <bruce.richardson@intel.com>
Subject: [dpdk-dev] [PATCH] doc: support building HTML guides with meson
Date: Tue, 11 Sep 2018 17:13:22 +0100 [thread overview]
Message-ID: <20180911161322.20114-1-bruce.richardson@intel.com> (raw)
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
NOTE: this patch depends upon:
http://patches.dpdk.org/project/dpdk/list/?series=1232
doc/api/meson.build | 3 ++-
doc/guides/meson.build | 16 ++++++++++++++++
doc/meson.build | 11 +++++++++++
3 files changed, 29 insertions(+), 1 deletion(-)
create mode 100644 doc/guides/meson.build
diff --git a/doc/api/meson.build b/doc/api/meson.build
index 5dfa0fe04..f9bee4dac 100644
--- a/doc/api/meson.build
+++ b/doc/api/meson.build
@@ -50,5 +50,6 @@ if doxygen.found()
install_dir: htmldir,
build_by_default: false)
- run_target('doc', command: 'true', depends: doxy_build)
+ doc_targets += doxy_build
+ doc_target_names += 'Doxygen_API'
endif
diff --git a/doc/guides/meson.build b/doc/guides/meson.build
new file mode 100644
index 000000000..6d1e2990d
--- /dev/null
+++ b/doc/guides/meson.build
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017 Intel Corporation
+
+sphinx = find_program('sphinx-build', required: get_option('enable_docs'))
+
+if sphinx.found()
+ html_guides_build = custom_target('html_guides_build',
+ input: meson.current_source_dir(),
+ output: 'index.html',
+ command: [sphinx, '-b', 'html', '@INPUT@', meson.current_build_dir() + '/html'],
+ build_by_default: false,
+ install: get_option('enable_docs'))
+
+ doc_targets += html_guides_build
+ doc_target_names += 'HTML_Guides'
+endif
diff --git a/doc/meson.build b/doc/meson.build
index afca2e713..c5410d85d 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -1,4 +1,15 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
+doc_targets = []
+doc_target_names = []
subdir('api')
+subdir('guides')
+
+if doc_targets.length() == 0
+ message = 'No docs targets found'
+else
+ message = 'Building docs:'
+endif
+run_target('doc', command: ['echo', message, doc_target_names],
+ depends: doc_targets)
--
2.11.0
next reply other threads:[~2018-09-11 16:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-11 16:13 Bruce Richardson [this message]
2018-09-11 20:36 ` Luca Boccassi
2018-09-11 21:47 ` Luca Boccassi
2018-09-12 9:36 ` Bruce Richardson
2018-09-12 9:48 ` Luca Boccassi
2018-09-12 10:13 ` Bruce Richardson
2018-09-12 12:08 ` Luca Boccassi
2018-09-19 13:48 ` [dpdk-dev] [PATCH v2] " Luca Boccassi
2018-09-20 13:19 ` Timothy Redaelli
2018-09-20 13:22 ` [dpdk-dev] [PATCH v3] " Luca Boccassi
2018-09-20 13:51 ` Timothy Redaelli
2018-10-27 21:54 ` Thomas Monjalon
2018-10-29 10:01 ` Luca Boccassi
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=20180911161322.20114-1-bruce.richardson@intel.com \
--to=bruce.richardson@intel.com \
--cc=bluca@debian.org \
--cc=dev@dpdk.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).