From: Bruce Richardson <bruce.richardson@intel.com> To: david.marchand@redhat.com, john.mcnamara@intel.com, bluca@debian.org Cc: dev@dpdk.org, aconole@redhat.com, thomas@monjalon.net, Bruce Richardson <bruce.richardson@intel.com>, stable@dpdk.org Subject: [dpdk-stable] [PATCH v4 4/6] doc/guides: reduce whitespace in meson build file Date: Fri, 10 Jan 2020 21:52:03 +0000 Message-ID: <20200110215205.513185-5-bruce.richardson@intel.com> (raw) In-Reply-To: <20200110215205.513185-1-bruce.richardson@intel.com> For building the guides, we can make the meson.build easier to read by using the subdir_done function to quit early. Cc: stable@dpdk.org Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> Acked-by: Aaron Conole <aconole@redhat.com> Acked-by: Luca Boccassi <bluca@debian.org> --- @stable, this may be considered for 19.11 backport to make other backporting to this file easier. --- doc/guides/meson.build | 44 ++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/doc/guides/meson.build b/doc/guides/meson.build index 7931ef3bb..80c21d168 100644 --- a/doc/guides/meson.build +++ b/doc/guides/meson.build @@ -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') -- 2.24.1
next prev parent reply other threads:[~2020-01-10 21:52 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <20200109115631.500056-1-bruce.richardson@intel.com> [not found] ` <20200109153112.501282-1-bruce.richardson@intel.com> [not found] ` <20200109153112.501282-4-bruce.richardson@intel.com> [not found] ` <CAJFAV8whTkvXz99MHVxnSYdjr15eMCqaYbnh1fS3RGNdd=UD_g@mail.gmail.com> 2020-01-10 9:16 ` [dpdk-stable] [PATCH v3 3/6] doc/api: fix warning with meson build Bruce Richardson [not found] ` <20200110215205.513185-1-bruce.richardson@intel.com> 2020-01-10 21:52 ` [dpdk-stable] [PATCH v4 1/6] kernel/linux/kni: fix meson warning about console keyword Bruce Richardson 2020-01-10 21:52 ` [dpdk-stable] [PATCH v4 3/6] doc/api: fix warning with meson build Bruce Richardson 2020-01-10 21:52 ` Bruce Richardson [this message] 2020-01-10 21:52 ` [dpdk-stable] [PATCH v4 6/6] doc/api: reduce indentation in meson build file Bruce Richardson
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=20200110215205.513185-5-bruce.richardson@intel.com \ --to=bruce.richardson@intel.com \ --cc=aconole@redhat.com \ --cc=bluca@debian.org \ --cc=david.marchand@redhat.com \ --cc=dev@dpdk.org \ --cc=john.mcnamara@intel.com \ --cc=stable@dpdk.org \ --cc=thomas@monjalon.net \ /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
patches for DPDK stable branches This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \ stable@dpdk.org public-inbox-index stable Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.stable AGPL code for this site: git clone https://public-inbox.org/public-inbox.git