From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id B19C2A051C
for <public@inbox.dpdk.org>; Tue, 11 Feb 2020 12:22:57 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id AA3492B9C;
Tue, 11 Feb 2020 12:22:57 +0100 (CET)
Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com
[209.85.128.65]) by dpdk.org (Postfix) with ESMTP id DC54E2B9C
for <stable@dpdk.org>; Tue, 11 Feb 2020 12:22:56 +0100 (CET)
Received: by mail-wm1-f65.google.com with SMTP id q9so2995016wmj.5
for <stable@dpdk.org>; Tue, 11 Feb 2020 03:22:56 -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=HKx3z4KjfFiIgIjXcQFgAjonc7fPPdKHIX+YjUmZsFQ=;
b=eQnWpzbd6eJfNEB00mSjXpi8OzKx6hXN/HtG/nyVj6keM3ztVGztznQT1ZBKB2USKK
5sKLF2cgyxw0xdiy3o2Gyc6b6q1pscX/jw0utYDlxbCqhmTnMd0ehqe0MBUsbO7w3leL
OGOrgch3Fq19CXiqx6y/9WomUuQVpL3q4zSIeteHY8IfQBbvEDk2Wwy7njUtykWHGKDV
R6dYE/+1lREuGcyTTTaHHodRk6vNdendeunFkayuOnipKiMG/0w1ufYEUKHZPYCdwzNC
COXTH+WkBfU8InQqfzzHmG4SX/Sq+XWA8gTGLERVZo8OvipaluhueQN7oeaeIA6RBDC1
GrNQ==
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=HKx3z4KjfFiIgIjXcQFgAjonc7fPPdKHIX+YjUmZsFQ=;
b=FubdppJzv/6aQqCgG+SBGS+nhVzoZk+XyeqacAhVYmHETnRqhpbW0c8luDqEqCb4c3
Aj2MNiV2MvhK7kVMH/3rEgSTUr4pq35RGZge3bGR/yHW7h4zdJ+7weH8ofApqYmFgkex
UMrdn9ezNAmqkJ6BhNzAGtbuRevnRzugLh0GTvwUexBXnOM+8kvmsxIJ0rHYCl+9F44P
4awzncdiEFoASEYqZrQIKCI7ftOFE/ZkEv9OiBJkLuVq02+/Y+mOvX65CTsSpy9ypj1q
Bwm0k8RhWUggOaAPm0j4w5vC0Y6w1rK2lf4x19al1qy2cud2fdSSqbmigmC8TlSQQ4dA
mnGA==
X-Gm-Message-State: APjAAAVFmtC63MsV/zbVy6xSwBTifmdXgCirNPWnoxzFn8EIZZ3vZdIC
FaTUIdMc5vGG6frIyuu5hE8/R0GK
X-Google-Smtp-Source: APXvYqzh4JGtMFBIqI1zY7Bp2HxcFBgIeTtrxlyBIKBwGtaAOKmvpx0qIjyIM4FXQU2uxW1+G2iNAw==
X-Received: by 2002:a1c:5f41:: with SMTP id t62mr5238973wmb.42.1581420175694;
Tue, 11 Feb 2020 03:22:55 -0800 (PST)
Received: from localhost ([88.98.246.218])
by smtp.gmail.com with ESMTPSA id p11sm5005788wrn.40.2020.02.11.03.22.54
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 11 Feb 2020 03:22:54 -0800 (PST)
From: luca.boccassi@gmail.com
To: Bruce Richardson <bruce.richardson@intel.com>
Cc: Aaron Conole <aconole@redhat.com>, Luca Boccassi <bluca@debian.org>,
dpdk stable <stable@dpdk.org>
Date: Tue, 11 Feb 2020 11:19:20 +0000
Message-Id: <20200211112216.3929-14-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 indentation 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 <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
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 323f74402f61bd29c3180aafae1268a178b26a66 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Fri, 10 Jan 2020 21:52:05 +0000
Subject: [PATCH] doc: reduce indentation in meson build file
[ upstream commit bbfc94efcafab236339cd1ec73bb523275d52c60 ]
When building the API docs, we can make the meson.build file easier to
read, and allow more code per line, by using subdir_done() 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>
---
doc/api/meson.build | 98 +++++++++++++++++++++++----------------------
1 file changed, 50 insertions(+), 48 deletions(-)
diff --git a/doc/api/meson.build b/doc/api/meson.build
index 23a7dfc759..c72b880e10 100644
--- a/doc/api/meson.build
+++ b/doc/api/meson.build
@@ -3,52 +3,54 @@
doxygen = find_program('doxygen', required: get_option('enable_docs'))
-if doxygen.found()
- # due to the CSS customisation script, which needs to run on a file that
- # is in a subdirectory that is created at build time and thus it cannot
- # be an individual custom_target, we need to wrap the doxygen call in a
- # script to run the CSS modification afterwards
- generate_doxygen = find_program('generate_doxygen.sh')
- generate_examples = find_program('generate_examples.sh')
- generate_css = find_program('doxy-html-custom.sh')
-
- inputdir = join_paths(meson.source_root(), 'examples')
- htmldir = join_paths('share', 'doc', 'dpdk')
-
- # due to the following bug: https://github.com/mesonbuild/meson/issues/4107
- # if install is set to true it will override build_by_default and it will
- # cause the target to always be built. If install were to be always set to
- # false it would be impossible to install the docs.
- # So use a configure option for now.
- example = custom_target('examples.dox',
- input: inputdir,
- output: 'examples.dox',
- command: [generate_examples, '@INPUT@', '@OUTPUT@'],
- install: get_option('enable_docs'),
- install_dir: htmldir,
- build_by_default: get_option('enable_docs'))
-
- cdata = configuration_data()
- cdata.set('VERSION', meson.project_version())
- cdata.set('API_EXAMPLES', join_paths(meson.build_root(), 'doc', 'api', 'examples.dox'))
- cdata.set('OUTPUT', join_paths(meson.build_root(), 'doc', 'api'))
- cdata.set('HTML_OUTPUT', 'api')
- cdata.set('TOPDIR', meson.source_root())
- cdata.set('STRIP_FROM_PATH', meson.source_root())
-
- doxy_conf = configure_file(input: 'doxy-api.conf.in',
- output: 'doxy-api.conf',
- configuration: cdata)
-
- doxy_build = custom_target('doxygen',
- depends: example,
- input: doxy_conf,
- output: 'api',
- command: [generate_doxygen, '@INPUT@', '@OUTPUT@', generate_css],
- install: get_option('enable_docs'),
- install_dir: htmldir,
- build_by_default: get_option('enable_docs'))
-
- doc_targets += doxy_build
- doc_target_names += 'Doxygen_API'
+if not doxygen.found()
+ subdir_done()
endif
+
+# due to the CSS customisation script, which needs to run on a file that
+# is in a subdirectory that is created at build time and thus it cannot
+# be an individual custom_target, we need to wrap the doxygen call in a
+# script to run the CSS modification afterwards
+generate_doxygen = find_program('generate_doxygen.sh')
+generate_examples = find_program('generate_examples.sh')
+generate_css = find_program('doxy-html-custom.sh')
+
+inputdir = join_paths(meson.source_root(), 'examples')
+htmldir = join_paths('share', 'doc', 'dpdk')
+
+# due to the following bug: https://github.com/mesonbuild/meson/issues/4107
+# if install is set to true it will override build_by_default and it will
+# cause the target to always be built. If install were to be always set to
+# false it would be impossible to install the docs.
+# So use a configure option for now.
+example = custom_target('examples.dox',
+ input: inputdir,
+ output: 'examples.dox',
+ command: [generate_examples, '@INPUT@', '@OUTPUT@'],
+ install: get_option('enable_docs'),
+ install_dir: htmldir,
+ build_by_default: get_option('enable_docs'))
+
+cdata = configuration_data()
+cdata.set('VERSION', meson.project_version())
+cdata.set('API_EXAMPLES', join_paths(meson.build_root(), 'doc', 'api', 'examples.dox'))
+cdata.set('OUTPUT', join_paths(meson.build_root(), 'doc', 'api'))
+cdata.set('HTML_OUTPUT', 'api')
+cdata.set('TOPDIR', meson.source_root())
+cdata.set('STRIP_FROM_PATH', meson.source_root())
+
+doxy_conf = configure_file(input: 'doxy-api.conf.in',
+ output: 'doxy-api.conf',
+ configuration: cdata)
+
+doxy_build = custom_target('doxygen',
+ depends: example,
+ input: doxy_conf,
+ output: 'api',
+ command: [generate_doxygen, '@INPUT@', '@OUTPUT@', generate_css],
+ install: get_option('enable_docs'),
+ install_dir: htmldir,
+ build_by_default: get_option('enable_docs'))
+
+doc_targets += doxy_build
+doc_target_names += 'Doxygen_API'
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-02-11 11:17:39.537138506 +0000
+++ 0014-doc-reduce-indentation-in-meson-build-file.patch 2020-02-11 11:17:38.311999701 +0000
@@ -1,12 +1,13 @@
-From bbfc94efcafab236339cd1ec73bb523275d52c60 Mon Sep 17 00:00:00 2001
+From 323f74402f61bd29c3180aafae1268a178b26a66 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Fri, 10 Jan 2020 21:52:05 +0000
Subject: [PATCH] doc: reduce indentation in meson build file
+[ upstream commit bbfc94efcafab236339cd1ec73bb523275d52c60 ]
+
When building the API docs, we can make the meson.build file easier to
read, and allow more code per line, by using subdir_done() 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>