Skip to content

Commit

Permalink
doc: reduce whitespace in meson build file
Browse files Browse the repository at this point in the history
[ upstream commit affc17c ]

For building the guides, we can make the meson.build easier to read by
using the subdir_done function to quit early.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Aaron Conole <aconole@redhat.com>
Acked-by: Luca Boccassi <bluca@debian.org>
  • Loading branch information
bruce-richardson authored and kevintraynor committed Feb 7, 2020
1 parent 21d2e1a commit 42c459b
Showing 1 changed file with 23 additions and 21 deletions.
44 changes: 23 additions & 21 deletions doc/guides/meson.build
Expand Up @@ -3,26 +3,28 @@

sphinx = find_program('sphinx-build', required: get_option('enable_docs'))

if sphinx.found()
htmldir = join_paths('share', 'doc', 'dpdk')
html_guides_build = custom_target('html_guides_build',
input: meson.current_source_dir(),
output: 'guides',
command: [sphinx, '-b', 'html',
'-d', meson.current_build_dir() + '/.doctrees',
'@INPUT@', meson.current_build_dir() + '/guides'],
build_by_default: get_option('enable_docs'),
install: get_option('enable_docs'),
install_dir: htmldir)
if not sphinx.found()
subdir_done()
endif

doc_targets += html_guides_build
doc_target_names += 'HTML_Guides'
htmldir = join_paths('share', 'doc', 'dpdk')
html_guides = custom_target('html_guides',
input: meson.current_source_dir(),
output: 'guides',
command: [sphinx, '-b', 'html',
'-d', meson.current_build_dir() + '/.doctrees',
'@INPUT@', meson.current_build_dir() + '/guides'],
build_by_default: get_option('enable_docs'),
install: get_option('enable_docs'),
install_dir: htmldir)

# sphinx leaves a .buildinfo in the target directory, which we don't
# want to install. Note that sh -c has to be used, otherwise the
# env var does not get expanded if calling rm/install directly.
meson.add_install_script('sh', '-c',
'rm -f $MESON_INSTALL_DESTDIR_PREFIX/share/doc/dpdk/guides/.buildinfo')
meson.add_install_script('sh', '-c',
'install -D -m0644 $MESON_SOURCE_ROOT/doc/guides/custom.css $MESON_INSTALL_DESTDIR_PREFIX/share/doc/dpdk/guides/_static/css/custom.css')
endif
doc_targets += html_guides
doc_target_names += 'HTML_Guides'

# sphinx leaves a .buildinfo in the target directory, which we don't
# want to install. Note that sh -c has to be used, otherwise the
# env var does not get expanded if calling rm/install directly.
meson.add_install_script('sh', '-c',
'rm -f $MESON_INSTALL_DESTDIR_PREFIX/share/doc/dpdk/guides/.buildinfo')
meson.add_install_script('sh', '-c',
'install -D -m0644 $MESON_SOURCE_ROOT/doc/guides/custom.css $MESON_INSTALL_DESTDIR_PREFIX/share/doc/dpdk/guides/_static/css/custom.css')

0 comments on commit 42c459b

Please sign in to comment.