* [PATCH v2] libtracefs: add option to disable documentation
@ 2023-09-30 20:40 Giulio Benetti
2024-01-06 12:41 ` Giulio Benetti
0 siblings, 1 reply; 3+ messages in thread
From: Giulio Benetti @ 2023-09-30 20:40 UTC (permalink / raw)
To: linux-trace-devel; +Cc: Giulio Benetti
On some Linux environment builder(i.e. Buildroot) host asciidoc is not
provided since by default all man/docs are not installed to target but
meson.build at the moment build ascii and html documentation and
requires asciidoc making the building to fail. So let's add doc option
set to true by default to let the user to override it and not produce
the documentation.
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
V1->V2:
* improve commit log as suggested by Steve Rostedt
---
meson.build | 3 +++
meson_options.txt | 2 ++
2 files changed, 5 insertions(+)
diff --git a/meson.build b/meson.build
index 9d42d78..f1e492e 100644
--- a/meson.build
+++ b/meson.build
@@ -39,6 +39,8 @@ if cunit_dep.found()
subdir('utest')
endif
subdir('samples')
+
+if get_option('doc')
subdir('Documentation')
custom_target(
@@ -46,3 +48,4 @@ custom_target(
output: 'docs',
depends: [html, man],
command: ['echo'])
+endif
diff --git a/meson_options.txt b/meson_options.txt
index 1d92c28..5533a88 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -14,3 +14,5 @@ option('man-bold-literal', type : 'boolean', value : false,
description : 'enable bold literals')
option('docbook-suppress-sp', type : 'boolean', value : false,
description : 'docbook suppress sp')
+option('doc', type : 'boolean', value: true,
+ description : 'produce documentation')
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] libtracefs: add option to disable documentation
2023-09-30 20:40 [PATCH v2] libtracefs: add option to disable documentation Giulio Benetti
@ 2024-01-06 12:41 ` Giulio Benetti
2024-01-08 19:32 ` Steven Rostedt
0 siblings, 1 reply; 3+ messages in thread
From: Giulio Benetti @ 2024-01-06 12:41 UTC (permalink / raw)
To: linux-trace-devel; +Cc: Steven Rostedt
Hi Steven,
would it be possible to commit this change before releasing new version?
This way I can add both libtracefs and libtraceevent without local
patches as you can see on this iteration to bump trace-cmd:
https://patchwork.ozlabs.org/project/buildroot/list/?series=379077
The same patch has been committed to libtraceevent:
https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/commit/?id=5b893850d20f8e4377dcdf66089d60e2559b4b26
Best regards
--
Giulio Benetti
CEO&CTO@Benetti Engineering sas
On 30/09/23 22:40, Giulio Benetti wrote:
> On some Linux environment builder(i.e. Buildroot) host asciidoc is not
> provided since by default all man/docs are not installed to target but
> meson.build at the moment build ascii and html documentation and
> requires asciidoc making the building to fail. So let's add doc option
> set to true by default to let the user to override it and not produce
> the documentation.
>
> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
> ---
> V1->V2:
> * improve commit log as suggested by Steve Rostedt
> ---
> meson.build | 3 +++
> meson_options.txt | 2 ++
> 2 files changed, 5 insertions(+)
>
> diff --git a/meson.build b/meson.build
> index 9d42d78..f1e492e 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -39,6 +39,8 @@ if cunit_dep.found()
> subdir('utest')
> endif
> subdir('samples')
> +
> +if get_option('doc')
> subdir('Documentation')
>
> custom_target(
> @@ -46,3 +48,4 @@ custom_target(
> output: 'docs',
> depends: [html, man],
> command: ['echo'])
> +endif
> diff --git a/meson_options.txt b/meson_options.txt
> index 1d92c28..5533a88 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -14,3 +14,5 @@ option('man-bold-literal', type : 'boolean', value : false,
> description : 'enable bold literals')
> option('docbook-suppress-sp', type : 'boolean', value : false,
> description : 'docbook suppress sp')
> +option('doc', type : 'boolean', value: true,
> + description : 'produce documentation')
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] libtracefs: add option to disable documentation
2024-01-06 12:41 ` Giulio Benetti
@ 2024-01-08 19:32 ` Steven Rostedt
0 siblings, 0 replies; 3+ messages in thread
From: Steven Rostedt @ 2024-01-08 19:32 UTC (permalink / raw)
To: Giulio Benetti; +Cc: linux-trace-devel
On Sat, 6 Jan 2024 13:41:12 +0100
Giulio Benetti <giulio.benetti@benettiengineering.com> wrote:
> Hi Steven,
>
> would it be possible to commit this change before releasing new version?
> This way I can add both libtracefs and libtraceevent without local
> patches as you can see on this iteration to bump trace-cmd:
> https://patchwork.ozlabs.org/project/buildroot/list/?series=379077
>
> The same patch has been committed to libtraceevent:
> https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/commit/?id=5b893850d20f8e4377dcdf66089d60e2559b4b26
>
> Best regards
Strange, patchwork had this as "Accepted", but it wasn't. Which would hide
it from me. :-/
Not sure how that happened. Thanks for letting me know. I'll add it now.
-- Steve
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-01-08 19:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-30 20:40 [PATCH v2] libtracefs: add option to disable documentation Giulio Benetti
2024-01-06 12:41 ` Giulio Benetti
2024-01-08 19:32 ` Steven Rostedt
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).