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 ABDDDA0487 for ; Fri, 5 Jul 2019 18:35:34 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B2D161BDE4; Fri, 5 Jul 2019 18:35:33 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 3B46A1BDE2; Fri, 5 Jul 2019 18:35:31 +0200 (CEST) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Jul 2019 09:35:29 -0700 X-IronPort-AV: E=Sophos;i="5.63,455,1557212400"; d="scan'208";a="187900932" Received: from bricha3-mobl.ger.corp.intel.com ([10.237.221.51]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Jul 2019 09:35:28 -0700 Date: Fri, 5 Jul 2019 17:35:26 +0100 From: Bruce Richardson To: Luca Boccassi Cc: dev@dpdk.org, stable@dpdk.org, alialnu@mellanox.com Message-ID: <20190705163525.GA465@bricha3-MOBL.ger.corp.intel.com> References: <20190705155655.31636-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.4 (2019-03-13) Subject: Re: [dpdk-dev] [PATCH] doc: fix doc build with latest meson X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Fri, Jul 05, 2019 at 05:30:49PM +0100, Luca Boccassi wrote: > On Fri, 2019-07-05 at 17:18 +0100, Luca Boccassi wrote: > > On Fri, 2019-07-05 at 16:56 +0100, Bruce Richardson wrote: > > > The latest versions of meson don't build targets when > > > build_by_default is > > > false but install is true, unlike older versions. We can fix this > > > by > > > having > > > both build_by_default and install settings come from the build-time > > > option. > > > > > > Bugzilla ID: 303 > > > Fixes: d02a2dab2dfb ("doc: support building HTML guides with > > > meson") > > > Fixes: 720b14db3ae2 ("build: generate API documentation with > > > meson") > > > Cc: > > > bluca@debian.org > > > > > > > > > Cc: > > > stable@dpdk.org > > > > > > > > > Cc: > > > alialnu@mellanox.com > > > > > > > > > > > > Reported-by: Ali Alnubani < > > > alialnu@mellanox.com > > > > > > > > > Signed-off-by: Bruce Richardson < > > > bruce.richardson@intel.com > > > > > > > > > --- > > > doc/api/meson.build | 4 ++-- > > > doc/guides/meson.build | 2 +- > > > 2 files changed, 3 insertions(+), 3 deletions(-) > > > > > > diff --git a/doc/api/meson.build b/doc/api/meson.build > > > index 30bdc573b..1c48b7672 100644 > > > --- a/doc/api/meson.build > > > +++ b/doc/api/meson.build > > > @@ -26,7 +26,7 @@ if doxygen.found() > > > command: [generate_examples, '@INPUT@', '@OUTPUT@'], > > > install: get_option('enable_docs'), > > > install_dir: htmldir, > > > - build_by_default: false) > > > + build_by_default: get_option('enable_docs')) > > > > > > cdata = configuration_data() > > > cdata.set('VERSION', meson.project_version()) > > > @@ -48,7 +48,7 @@ if doxygen.found() > > > command: [generate_doxygen, '@INPUT@', '@OUTPUT@', > > > generate_css], > > > install: get_option('enable_docs'), > > > install_dir: htmldir, > > > - build_by_default: false) > > > + build_by_default: get_option('enable_docs')) > > > > > > doc_targets += doxy_build > > > doc_target_names += 'Doxygen_API' > > > diff --git a/doc/guides/meson.build b/doc/guides/meson.build > > > index 06f14882b..7931ef3bb 100644 > > > --- a/doc/guides/meson.build > > > +++ b/doc/guides/meson.build > > > @@ -11,7 +11,7 @@ if sphinx.found() > > > command: [sphinx, '-b', 'html', > > > '-d', meson.current_build_dir() + '/.doctrees', > > > '@INPUT@', meson.current_build_dir() + > > > '/guides'], > > > - build_by_default: false, > > > + build_by_default: get_option('enable_docs'), > > > install: get_option('enable_docs'), > > > install_dir: htmldir) > > > > > > > Mmh why do I feel a deja-vu? Did we already fix this in the past? > > lol it's my fault that's why: https://github.com/mesonbuild/meson/commit/267792174c9921e6be296086b0c806a684432a1b > Ok, good to know. Thomas can add a "Blame-it-on:" tag when applying :-)