[dpdk-dev] [PATCH] doc: fix doc build with latest meson

[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 at debian.org
> 
> Cc: 
> stable at dpdk.org
> 
> Cc: 
> alialnu at mellanox.com
> 
> 
> Reported-by: Ali Alnubani <
> alialnu at mellanox.com
> >
> Signed-off-by: Bruce Richardson <
> bruce.richardson at 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