* [dpdk-dev] [PATCH] doc: fix doc build with latest meson
@ 2019-07-05 15:56 Bruce Richardson
2019-07-05 16:18 ` Luca Boccassi
2019-07-05 16:31 ` Luca Boccassi
0 siblings, 2 replies; 6+ messages in thread
From: Bruce Richardson @ 2019-07-05 15:56 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, bluca, stable, alialnu
The latest versions of meson don't build targets when build_by_default is
false but install is true, unlike older versions. We can fix this by having
both build_by_default and install settings come from the build-time option.
Bugzilla ID: 303
Fixes: d02a2dab2dfb ("doc: support building HTML guides with meson")
Fixes: 720b14db3ae2 ("build: generate API documentation with meson")
Cc: bluca@debian.org
Cc: stable@dpdk.org
Cc: alialnu@mellanox.com
Reported-by: Ali Alnubani <alialnu@mellanox.com>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
doc/api/meson.build | 4 ++--
doc/guides/meson.build | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/api/meson.build b/doc/api/meson.build
index 30bdc573b..1c48b7672 100644
--- a/doc/api/meson.build
+++ b/doc/api/meson.build
@@ -26,7 +26,7 @@ if doxygen.found()
command: [generate_examples, '@INPUT@', '@OUTPUT@'],
install: get_option('enable_docs'),
install_dir: htmldir,
- build_by_default: false)
+ build_by_default: get_option('enable_docs'))
cdata = configuration_data()
cdata.set('VERSION', meson.project_version())
@@ -48,7 +48,7 @@ if doxygen.found()
command: [generate_doxygen, '@INPUT@', '@OUTPUT@', generate_css],
install: get_option('enable_docs'),
install_dir: htmldir,
- build_by_default: false)
+ build_by_default: get_option('enable_docs'))
doc_targets += doxy_build
doc_target_names += 'Doxygen_API'
diff --git a/doc/guides/meson.build b/doc/guides/meson.build
index 06f14882b..7931ef3bb 100644
--- a/doc/guides/meson.build
+++ b/doc/guides/meson.build
@@ -11,7 +11,7 @@ if sphinx.found()
command: [sphinx, '-b', 'html',
'-d', meson.current_build_dir() + '/.doctrees',
'@INPUT@', meson.current_build_dir() + '/guides'],
- build_by_default: false,
+ build_by_default: get_option('enable_docs'),
install: get_option('enable_docs'),
install_dir: htmldir)
--
2.21.0
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [dpdk-dev] [PATCH] doc: fix doc build with latest meson
2019-07-05 15:56 [dpdk-dev] [PATCH] doc: fix doc build with latest meson Bruce Richardson
@ 2019-07-05 16:18 ` Luca Boccassi
2019-07-05 16:30 ` Luca Boccassi
2019-07-05 16:31 ` Luca Boccassi
1 sibling, 1 reply; 6+ messages in thread
From: Luca Boccassi @ 2019-07-05 16:18 UTC (permalink / raw)
To: Bruce Richardson, dev; +Cc: stable, alialnu
On Fri, 2019-07-05 at 16:56 +0100, Bruce Richardson wrote:
> The latest versions of meson don't build targets when
> build_by_default is
> false but install is true, unlike older versions. We can fix this by
> having
> both build_by_default and install settings come from the build-time
> option.
>
> Bugzilla ID: 303
> Fixes: d02a2dab2dfb ("doc: support building HTML guides with meson")
> Fixes: 720b14db3ae2 ("build: generate API documentation with meson")
> Cc:
> bluca@debian.org
>
> Cc:
> stable@dpdk.org
>
> Cc:
> alialnu@mellanox.com
>
>
> Reported-by: Ali Alnubani <
> alialnu@mellanox.com
> >
> Signed-off-by: Bruce Richardson <
> bruce.richardson@intel.com
> >
> ---
> doc/api/meson.build | 4 ++--
> doc/guides/meson.build | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/doc/api/meson.build b/doc/api/meson.build
> index 30bdc573b..1c48b7672 100644
> --- a/doc/api/meson.build
> +++ b/doc/api/meson.build
> @@ -26,7 +26,7 @@ if doxygen.found()
> command: [generate_examples, '@INPUT@', '@OUTPUT@'],
> install: get_option('enable_docs'),
> install_dir: htmldir,
> - build_by_default: false)
> + build_by_default: get_option('enable_docs'))
>
> cdata = configuration_data()
> cdata.set('VERSION', meson.project_version())
> @@ -48,7 +48,7 @@ if doxygen.found()
> command: [generate_doxygen, '@INPUT@', '@OUTPUT@',
> generate_css],
> install: get_option('enable_docs'),
> install_dir: htmldir,
> - build_by_default: false)
> + build_by_default: get_option('enable_docs'))
>
> doc_targets += doxy_build
> doc_target_names += 'Doxygen_API'
> diff --git a/doc/guides/meson.build b/doc/guides/meson.build
> index 06f14882b..7931ef3bb 100644
> --- a/doc/guides/meson.build
> +++ b/doc/guides/meson.build
> @@ -11,7 +11,7 @@ if sphinx.found()
> command: [sphinx, '-b', 'html',
> '-d', meson.current_build_dir() + '/.doctrees',
> '@INPUT@', meson.current_build_dir() +
> '/guides'],
> - build_by_default: false,
> + build_by_default: get_option('enable_docs'),
> install: get_option('enable_docs'),
> install_dir: htmldir)
>
Mmh why do I feel a deja-vu? Did we already fix this in the past?
--
Kind regards,
Luca Boccassi
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [dpdk-dev] [PATCH] doc: fix doc build with latest meson
2019-07-05 16:18 ` Luca Boccassi
@ 2019-07-05 16:30 ` Luca Boccassi
2019-07-05 16:35 ` Bruce Richardson
0 siblings, 1 reply; 6+ messages in thread
From: Luca Boccassi @ 2019-07-05 16:30 UTC (permalink / raw)
To: Bruce Richardson, dev; +Cc: stable, alialnu
On Fri, 2019-07-05 at 17:18 +0100, Luca Boccassi wrote:
> On Fri, 2019-07-05 at 16:56 +0100, Bruce Richardson wrote:
> > The latest versions of meson don't build targets when
> > build_by_default is
> > false but install is true, unlike older versions. We can fix this
> > by
> > having
> > both build_by_default and install settings come from the build-time
> > option.
> >
> > Bugzilla ID: 303
> > Fixes: d02a2dab2dfb ("doc: support building HTML guides with
> > meson")
> > Fixes: 720b14db3ae2 ("build: generate API documentation with
> > meson")
> > Cc:
> > bluca@debian.org
> >
> >
> > Cc:
> > stable@dpdk.org
> >
> >
> > Cc:
> > alialnu@mellanox.com
> >
> >
> >
> > Reported-by: Ali Alnubani <
> > alialnu@mellanox.com
> >
> >
> > Signed-off-by: Bruce Richardson <
> > bruce.richardson@intel.com
> >
> >
> > ---
> > doc/api/meson.build | 4 ++--
> > doc/guides/meson.build | 2 +-
> > 2 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/doc/api/meson.build b/doc/api/meson.build
> > index 30bdc573b..1c48b7672 100644
> > --- a/doc/api/meson.build
> > +++ b/doc/api/meson.build
> > @@ -26,7 +26,7 @@ if doxygen.found()
> > command: [generate_examples, '@INPUT@', '@OUTPUT@'],
> > install: get_option('enable_docs'),
> > install_dir: htmldir,
> > - build_by_default: false)
> > + build_by_default: get_option('enable_docs'))
> >
> > cdata = configuration_data()
> > cdata.set('VERSION', meson.project_version())
> > @@ -48,7 +48,7 @@ if doxygen.found()
> > command: [generate_doxygen, '@INPUT@', '@OUTPUT@',
> > generate_css],
> > install: get_option('enable_docs'),
> > install_dir: htmldir,
> > - build_by_default: false)
> > + build_by_default: get_option('enable_docs'))
> >
> > doc_targets += doxy_build
> > doc_target_names += 'Doxygen_API'
> > diff --git a/doc/guides/meson.build b/doc/guides/meson.build
> > index 06f14882b..7931ef3bb 100644
> > --- a/doc/guides/meson.build
> > +++ b/doc/guides/meson.build
> > @@ -11,7 +11,7 @@ if sphinx.found()
> > command: [sphinx, '-b', 'html',
> > '-d', meson.current_build_dir() + '/.doctrees',
> > '@INPUT@', meson.current_build_dir() +
> > '/guides'],
> > - build_by_default: false,
> > + build_by_default: get_option('enable_docs'),
> > install: get_option('enable_docs'),
> > install_dir: htmldir)
> >
>
> Mmh why do I feel a deja-vu? Did we already fix this in the past?
lol it's my fault that's why: https://github.com/mesonbuild/meson/commit/267792174c9921e6be296086b0c806a684432a1b
--
Kind regards,
Luca Boccassi
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [dpdk-dev] [PATCH] doc: fix doc build with latest meson
2019-07-05 16:30 ` Luca Boccassi
@ 2019-07-05 16:35 ` Bruce Richardson
0 siblings, 0 replies; 6+ messages in thread
From: Bruce Richardson @ 2019-07-05 16:35 UTC (permalink / raw)
To: Luca Boccassi; +Cc: dev, stable, alialnu
On Fri, Jul 05, 2019 at 05:30:49PM +0100, Luca Boccassi wrote:
> On Fri, 2019-07-05 at 17:18 +0100, Luca Boccassi wrote:
> > On Fri, 2019-07-05 at 16:56 +0100, Bruce Richardson wrote:
> > > The latest versions of meson don't build targets when
> > > build_by_default is
> > > false but install is true, unlike older versions. We can fix this
> > > by
> > > having
> > > both build_by_default and install settings come from the build-time
> > > option.
> > >
> > > Bugzilla ID: 303
> > > Fixes: d02a2dab2dfb ("doc: support building HTML guides with
> > > meson")
> > > Fixes: 720b14db3ae2 ("build: generate API documentation with
> > > meson")
> > > Cc:
> > > bluca@debian.org
> > >
> > >
> > > Cc:
> > > stable@dpdk.org
> > >
> > >
> > > Cc:
> > > alialnu@mellanox.com
> > >
> > >
> > >
> > > Reported-by: Ali Alnubani <
> > > alialnu@mellanox.com
> > >
> > >
> > > Signed-off-by: Bruce Richardson <
> > > bruce.richardson@intel.com
> > >
> > >
> > > ---
> > > doc/api/meson.build | 4 ++--
> > > doc/guides/meson.build | 2 +-
> > > 2 files changed, 3 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/doc/api/meson.build b/doc/api/meson.build
> > > index 30bdc573b..1c48b7672 100644
> > > --- a/doc/api/meson.build
> > > +++ b/doc/api/meson.build
> > > @@ -26,7 +26,7 @@ if doxygen.found()
> > > command: [generate_examples, '@INPUT@', '@OUTPUT@'],
> > > install: get_option('enable_docs'),
> > > install_dir: htmldir,
> > > - build_by_default: false)
> > > + build_by_default: get_option('enable_docs'))
> > >
> > > cdata = configuration_data()
> > > cdata.set('VERSION', meson.project_version())
> > > @@ -48,7 +48,7 @@ if doxygen.found()
> > > command: [generate_doxygen, '@INPUT@', '@OUTPUT@',
> > > generate_css],
> > > install: get_option('enable_docs'),
> > > install_dir: htmldir,
> > > - build_by_default: false)
> > > + build_by_default: get_option('enable_docs'))
> > >
> > > doc_targets += doxy_build
> > > doc_target_names += 'Doxygen_API'
> > > diff --git a/doc/guides/meson.build b/doc/guides/meson.build
> > > index 06f14882b..7931ef3bb 100644
> > > --- a/doc/guides/meson.build
> > > +++ b/doc/guides/meson.build
> > > @@ -11,7 +11,7 @@ if sphinx.found()
> > > command: [sphinx, '-b', 'html',
> > > '-d', meson.current_build_dir() + '/.doctrees',
> > > '@INPUT@', meson.current_build_dir() +
> > > '/guides'],
> > > - build_by_default: false,
> > > + build_by_default: get_option('enable_docs'),
> > > install: get_option('enable_docs'),
> > > install_dir: htmldir)
> > >
> >
> > Mmh why do I feel a deja-vu? Did we already fix this in the past?
>
> lol it's my fault that's why: https://github.com/mesonbuild/meson/commit/267792174c9921e6be296086b0c806a684432a1b
>
Ok, good to know. Thomas can add a "Blame-it-on:" tag when applying :-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-dev] [PATCH] doc: fix doc build with latest meson
2019-07-05 15:56 [dpdk-dev] [PATCH] doc: fix doc build with latest meson Bruce Richardson
2019-07-05 16:18 ` Luca Boccassi
@ 2019-07-05 16:31 ` Luca Boccassi
2019-07-05 22:11 ` Thomas Monjalon
1 sibling, 1 reply; 6+ messages in thread
From: Luca Boccassi @ 2019-07-05 16:31 UTC (permalink / raw)
To: Bruce Richardson, dev; +Cc: stable, alialnu
On Fri, 2019-07-05 at 16:56 +0100, Bruce Richardson wrote:
> The latest versions of meson don't build targets when
> build_by_default is
> false but install is true, unlike older versions. We can fix this by
> having
> both build_by_default and install settings come from the build-time
> option.
>
> Bugzilla ID: 303
> Fixes: d02a2dab2dfb ("doc: support building HTML guides with meson")
> Fixes: 720b14db3ae2 ("build: generate API documentation with meson")
> Cc:
> bluca@debian.org
>
> Cc:
> stable@dpdk.org
>
> Cc:
> alialnu@mellanox.com
>
>
> Reported-by: Ali Alnubani <
> alialnu@mellanox.com
> >
> Signed-off-by: Bruce Richardson <
> bruce.richardson@intel.com
> >
> ---
> doc/api/meson.build | 4 ++--
> doc/guides/meson.build | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
Acked-by: Luca Boccassi <bluca@debian.org>
--
Kind regards,
Luca Boccassi
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [dpdk-dev] [PATCH] doc: fix doc build with latest meson
2019-07-05 16:31 ` Luca Boccassi
@ 2019-07-05 22:11 ` Thomas Monjalon
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Monjalon @ 2019-07-05 22:11 UTC (permalink / raw)
To: Bruce Richardson; +Cc: dev, Luca Boccassi, stable, alialnu
05/07/2019 18:31, Luca Boccassi:
> On Fri, 2019-07-05 at 16:56 +0100, Bruce Richardson wrote:
> > The latest versions of meson don't build targets when
> > build_by_default is
> > false but install is true, unlike older versions. We can fix this by
> > having
> > both build_by_default and install settings come from the build-time
> > option.
> >
> > Bugzilla ID: 303
> > Fixes: d02a2dab2dfb ("doc: support building HTML guides with meson")
> > Fixes: 720b14db3ae2 ("build: generate API documentation with meson")
> > Cc: bluca@debian.org
> > Cc: stable@dpdk.org
> > Cc: alialnu@mellanox.com
> >
> > Reported-by: Ali Alnubani <alialnu@mellanox.com>
> > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
>
> Acked-by: Luca Boccassi <bluca@debian.org>
Applied, thanks
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-07-05 22:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-05 15:56 [dpdk-dev] [PATCH] doc: fix doc build with latest meson Bruce Richardson
2019-07-05 16:18 ` Luca Boccassi
2019-07-05 16:30 ` Luca Boccassi
2019-07-05 16:35 ` Bruce Richardson
2019-07-05 16:31 ` Luca Boccassi
2019-07-05 22:11 ` Thomas Monjalon
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).