From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A0880A051C for ; Tue, 11 Feb 2020 12:22:54 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 97FAA2B9C; Tue, 11 Feb 2020 12:22:54 +0100 (CET) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 09A0D1BE90 for ; Tue, 11 Feb 2020 12:22:53 +0100 (CET) Received: by mail-wm1-f68.google.com with SMTP id s144so2030462wme.1 for ; Tue, 11 Feb 2020 03:22:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xEafcbx7ikMH9mDQE7V+nlh0j3kJqdKPrwpXpFkWlxE=; b=rY45fGmF+n86am86x0ZwlQlED7pyqo78/b3Txa3iZS57UBruckuzMXUQTV31W5jlRu kMCJGNSjQetM+lX+vLIj/RZCv1Sj+JTHY+wHIBEn2+pUBYiJzT559Gg/zvpgamot+6yH gKK/EuS+1kngiPwid0gUQzNyXU+2OphK9pOh5i42pxS3UYpfqwWRaIzHqRawjOY0jHRf bft6d0r9hRsikIwOkMpoPedmgN4GJeWAX6NuQRsSTdtsNs4y6AeVyYrGatnmxpM16Rfw o5e21xzjG/nUoKPpmyLZZin8FWlYkjrVcBfyJh0BxD+qzK/hYkqhpgoSOmiqaz0UFkpY jnsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xEafcbx7ikMH9mDQE7V+nlh0j3kJqdKPrwpXpFkWlxE=; b=giN59U3xPMAM1IYfOt/7DW8ynyMNTSYac2NPAo38O2zbsLEHSC/mL1T1hJGtyOuDuy vTHDnB9PFk3XJ2g0ymLD7LOnLzIr81Bpd+BXSp1gwSuZJp2qT3euHwldqXlH3/Ou61/O 5aM+Xsqc7i/O75JUqAsAw4TYBRw/ia2SDLo2VBPGkbJQfsF1Cz+1V5vcowVL0zwBgR00 n8xmTZiig8PSDW9/kexWorLkxmx8fPodue4jvwVmI1sgQRhwPfPc4iIhCSBhMM00h5Yr mr7C5xovFJYYN9BIM8zP0/6bjQh2+EGZrNkYo0oVZc1JEE92LTTU0SgAJQiN/Cq1B/Au oo4g== X-Gm-Message-State: APjAAAWZ54Gyo5AY5w9gXCP25aQZaEi73BM/alfUjcFNqhj5Rb87oap0 IojGbu9DmSgF/MEvqc14KOyl93x5 X-Google-Smtp-Source: APXvYqw2+dK727nsUxaS7Tz8wRYyrH77NHaURy0k/R3otMvUQQWVtkHsoKh6tiGh46M1EwGQ8UD5rw== X-Received: by 2002:a05:600c:10d2:: with SMTP id l18mr5062537wmd.122.1581420172792; Tue, 11 Feb 2020 03:22:52 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id g7sm4909001wrq.21.2020.02.11.03.22.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:22:52 -0800 (PST) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Aaron Conole , Luca Boccassi , dpdk stable Date: Tue, 11 Feb 2020 11:19:19 +0000 Message-Id: <20200211112216.3929-13-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'doc: reduce whitespace in meson build file' has been queued to stable release 19.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 59f2b081a108fe568becb6cc8010b395cc61a29a Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 10 Jan 2020 21:52:03 +0000 Subject: [PATCH] doc: reduce whitespace in meson build file [ upstream commit affc17c821e37e53d786a1d0b7c179f533684ac1 ] 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 Acked-by: Aaron Conole Acked-by: Luca Boccassi --- doc/guides/meson.build | 46 ++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/doc/guides/meson.build b/doc/guides/meson.build index 7931ef3bb5..80c21d1682 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) - - doc_targets += html_guides_build - 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') +if not sphinx.found() + subdir_done() endif + +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) + +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.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:39.489210884 +0000 +++ 0013-doc-reduce-whitespace-in-meson-build-file.patch 2020-02-11 11:17:38.311999701 +0000 @@ -1,13 +1,13 @@ -From affc17c821e37e53d786a1d0b7c179f533684ac1 Mon Sep 17 00:00:00 2001 +From 59f2b081a108fe568becb6cc8010b395cc61a29a Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 10 Jan 2020 21:52:03 +0000 Subject: [PATCH] doc: reduce whitespace in meson build file +[ upstream commit affc17c821e37e53d786a1d0b7c179f533684ac1 ] + 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 Acked-by: Aaron Conole Acked-by: Luca Boccassi