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 80A73A0542 for ; Fri, 7 Feb 2020 16:13:38 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 32E1D1C130; Fri, 7 Feb 2020 16:13:38 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id CB29B1C127 for ; Fri, 7 Feb 2020 16:13:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581088416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NEEJJeS47DnsYJk0MCJ+yNeP6qSTRJCIEaWfs5axpnM=; b=eY+Ngm2QSxck6Tl7uchrmFHWVWaRwXJ8tUnUpKYR/eYEYSYgU4xmvmBc4FE+NJ4gIfN3Tc ADoseB00b0EZSr3Bh5vrY4+H00RppQCEmUDxjVSUPlNCFvBt9AyauGFCiawlazGIw8n3ey ZWyUjgzdTt0hSssHeZobz6kK449WNIA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-393-sJeKnDw3OjWLARhTy54G6g-1; Fri, 07 Feb 2020 10:13:25 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 09E91800D5C; Fri, 7 Feb 2020 15:13:24 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0919510016DA; Fri, 7 Feb 2020 15:13:20 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Aaron Conole , Luca Boccassi , dpdk stable Date: Fri, 7 Feb 2020 15:12:20 +0000 Message-Id: <20200207151248.29804-8-ktraynor@redhat.com> In-Reply-To: <20200207151248.29804-1-ktraynor@redhat.com> References: <20200207151248.29804-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: sJeKnDw3OjWLARhTy54G6g-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'doc: reduce indentation in meson build file' has been queued to LTS release 18.11.7 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 LTS release 18.11.7 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 rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/a4b2868c21da1cfd5b= 70d287452eab4330689da3 Thanks. Kevin. --- >From a4b2868c21da1cfd5b70d287452eab4330689da3 Mon Sep 17 00:00:00 2001 From: Bruce Richardson 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 Acked-by: Aaron Conole Acked-by: Luca Boccassi --- 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 @@ -4,51 +4,53 @@ doxygen =3D find_program('doxygen', required: get_option('enable_docs')) =20 -if doxygen.found() -=09# due to the CSS customisation script, which needs to run on a file tha= t -=09# is in a subdirectory that is created at build time and thus it cannot -=09# be an individual custom_target, we need to wrap the doxygen call in a -=09# script to run the CSS modification afterwards -=09generate_doxygen =3D find_program('generate_doxygen.sh') -=09generate_examples =3D find_program('generate_examples.sh') -=09generate_css =3D find_program('doxy-html-custom.sh') - -=09inputdir =3D join_paths(meson.source_root(), 'examples') -=09htmldir =3D join_paths('share', 'doc', 'dpdk') - -=09# due to the following bug: https://github.com/mesonbuild/meson/issues/= 4107 -=09# if install is set to true it will override build_by_default and it wi= ll -=09# cause the target to always be built. If install were to be always set= to -=09# false it would be impossible to install the docs. -=09# So use a configure option for now. -=09example =3D custom_target('examples.dox', -=09=09input: inputdir, -=09=09output: 'examples.dox', -=09=09command: [generate_examples, '@INPUT@', '@OUTPUT@'], -=09=09install: get_option('enable_docs'), -=09=09install_dir: htmldir, -=09=09build_by_default: get_option('enable_docs')) - -=09cdata =3D configuration_data() -=09cdata.set('VERSION', meson.project_version()) -=09cdata.set('API_EXAMPLES', join_paths(meson.build_root(), 'doc', 'api', = 'examples.dox')) -=09cdata.set('OUTPUT', join_paths(meson.build_root(), 'doc', 'api')) -=09cdata.set('HTML_OUTPUT', 'api') -=09cdata.set('TOPDIR', meson.source_root()) -=09cdata.set('STRIP_FROM_PATH', meson.source_root()) - -=09doxy_conf =3D configure_file(input: 'doxy-api.conf.in', -=09=09output: 'doxy-api.conf', -=09=09configuration: cdata) - -=09doxy_build =3D custom_target('doxygen', -=09=09depends: example, -=09=09input: doxy_conf, -=09=09output: 'api', -=09=09command: [generate_doxygen, '@INPUT@', '@OUTPUT@', generate_css], -=09=09install: get_option('enable_docs'), -=09=09install_dir: htmldir, -=09=09build_by_default: get_option('enable_docs')) - -=09doc_targets +=3D doxy_build -=09doc_target_names +=3D '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 =3D find_program('generate_doxygen.sh') +generate_examples =3D find_program('generate_examples.sh') +generate_css =3D find_program('doxy-html-custom.sh') + +inputdir =3D join_paths(meson.source_root(), 'examples') +htmldir =3D join_paths('share', 'doc', 'dpdk') + +# due to the following bug: https://github.com/mesonbuild/meson/issues/410= 7 +# 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 =3D custom_target('examples.dox', +=09input: inputdir, +=09output: 'examples.dox', +=09command: [generate_examples, '@INPUT@', '@OUTPUT@'], +=09install: get_option('enable_docs'), +=09install_dir: htmldir, +=09build_by_default: get_option('enable_docs')) + +cdata =3D configuration_data() +cdata.set('VERSION', meson.project_version()) +cdata.set('API_EXAMPLES', join_paths(meson.build_root(), 'doc', 'api', 'ex= amples.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 =3D configure_file(input: 'doxy-api.conf.in', +=09output: 'doxy-api.conf', +=09configuration: cdata) + +doxy_build =3D custom_target('doxygen', +=09depends: example, +=09input: doxy_conf, +=09output: 'api', +=09command: [generate_doxygen, '@INPUT@', '@OUTPUT@', generate_css], +=09install: get_option('enable_docs'), +=09install_dir: htmldir, +=09build_by_default: get_option('enable_docs')) + +doc_targets +=3D doxy_build +doc_target_names +=3D 'Doxygen_API' --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-07 15:08:17.957769547 +0000 +++ 0008-doc-reduce-indentation-in-meson-build-file.patch=092020-02-07 15:0= 8:17.492063242 +0000 @@ -1 +1 @@ -From bbfc94efcafab236339cd1ec73bb523275d52c60 Mon Sep 17 00:00:00 2001 +From a4b2868c21da1cfd5b70d287452eab4330689da3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bbfc94efcafab236339cd1ec73bb523275d52c60 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org