From mboxrd@z Thu Jan 1 00:00:00 1970 From: Luca Boccassi Subject: Re: [PATCH 4/4] build: generate API documentation with Meson Date: Mon, 03 Sep 2018 10:34:57 +0100 Message-ID: <1535967297.11823.41.camel@debian.org> References: <20180831182055.30772-1-bluca@debian.org> <20180831182055.30772-5-bluca@debian.org> <1581479.dLBctXLE49@xps> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Cc: dev@dpdk.org, bruce.richardson@intel.com, john.mcnamara@intel.com, marko.kovacevic@intel.com To: Thomas Monjalon Return-path: Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by dpdk.org (Postfix) with ESMTP id 785785A for ; Mon, 3 Sep 2018 11:34:59 +0200 (CEST) Received: by mail-wm0-f68.google.com with SMTP id c14-v6so445655wmb.4 for ; Mon, 03 Sep 2018 02:34:59 -0700 (PDT) In-Reply-To: <1581479.dLBctXLE49@xps> 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 Mon, 2018-09-03 at 03:09 +0200, Thomas Monjalon wrote: > 31/08/2018 20:20, Luca Boccassi: > > Both a configuration-time "enable_docs" boolean option and an > > optional > > 'ninja doc' target are available. Note that due to a Meson bug for > > now > > the latter will only build, but not install the files. > >=20 > > Signed-off-by: Luca Boccassi > > --- > > =C2=A0doc/api/generate_doxygen.sh | 10 ++++++++ > > =C2=A0doc/api/meson.build=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0| 51 > > +++++++++++++++++++++++++++++++++++++ > > =C2=A0doc/build-sdk-meson.txt=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0|=C2=A0=C2= =A02 ++ > > =C2=A0doc/meson.build=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0|=C2=A0=C2=A04 +++ > > =C2=A0meson.build=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0|=C2=A0=C2=A03 +++ > > =C2=A0meson_options.txt=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0|=C2=A0=C2=A02 ++ > > =C2=A06 files changed, 72 insertions(+) >=20 > You use generate_doxygen.sh only with meson? > Shouldn't we use the same in mk/rte.sdkdoc.mk? I was kinda hoping somebody would be able to suggest an alternative that avoids the need for generate_doxygen.sh - the issue being that with Meson's "custom_target" you can't specify a subdirectory in input/ouput (and the directory is generated at build time so can't have a meson.build in it), and also you cannot use the same "output" twice. So I can't see a way to have an additional custom_target to run the CSS generation, hence the script. Changing the makefile to use the script will make it a bit more complicated, as the doxygen file will need to be generated rather than passed by piping stout/in, so the rule will have to be split into 3: create directory -> create file -> call doxygen. Not sure it's worth it? --=20 Kind regards, Luca Boccassi