[{"id":17205,"web_url":"https://patchwork.libcamera.org/comment/17205/","msgid":"","date":"2021-05-24T13:20:37","subject":"Re: [libcamera-devel] [RFC PATCH 5/6] meson: ipa: Pass core.mojom\n\tto the docs generator","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Paul,\n\nThank you for the patch.\n\nOn Mon, May 24, 2021 at 05:40:28PM +0900, Paul Elder wrote:\n> We don't want to generate the same functional files for core.mojom as\n> the other mojom files, but we do want to generate the documentation cpp\n> files. Add core.mojom to the mojom files list after the main generation\n> is complete, so that the documentation generator can pick it up.\n> \n> Signed-off-by: Paul Elder \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> include/libcamera/ipa/meson.build | 3 +++\n> 1 file changed, 3 insertions(+)\n> \n> diff --git a/include/libcamera/ipa/meson.build b/include/libcamera/ipa/meson.build\n> index c7fa5cd7..fc791b2f 100644\n> --- a/include/libcamera/ipa/meson.build\n> +++ b/include/libcamera/ipa/meson.build\n> @@ -143,3 +143,6 @@ foreach file : ipa_mojom_files\n> \n> libcamera_generated_ipa_headers += [header, serializer, proxy_header]\n> endforeach\n> +\n> +# Pass this to the documentation generator in src/libcamera/ipa\n> +ipa_mojom_files += files(['core.mojom'])","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 3C5D3C3201\n\tfor ;\n\tMon, 24 May 2021 13:20:43 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id F218A68915;\n\tMon, 24 May 2021 15:20:42 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 66FFA601AA\n\tfor ;\n\tMon, 24 May 2021 15:20:41 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 05171ED;\n\tMon, 24 May 2021 15:20:40 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"LvRfzIHl\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1621862441;\n\tbh=IGiAnjBV6wdzxrCzCd5oL/LiNH2ulYy0CIddLw6OGNU=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=LvRfzIHl55xbx6+p/mYCtKI0K/BX8nZgI3HLBQQSpyCEN8zD3p2Ag/+NqoSxYRGmb\n\t0FZ3JLz26reW5oUk2bagrpLw1xXOhyt8TULuv0VvWoUxiGsXPkRdO5a6RxOZSYPbl3\n\t3mWxkLpjmmQ7l+bDYyLFWaWRmC0RByRc6lDkhfOo=","Date":"Mon, 24 May 2021 16:20:37 +0300","From":"Laurent Pinchart ","To":"Paul Elder ","Message-ID":"","References":"<20210524084029.1179881-1-paul.elder@ideasonboard.com>\n\t<20210524084029.1179881-6-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210524084029.1179881-6-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [RFC PATCH 5/6] meson: ipa: Pass core.mojom\n\tto the docs generator","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":17206,"web_url":"https://patchwork.libcamera.org/comment/17206/","msgid":"","date":"2021-05-24T13:28:27","subject":"Re: [libcamera-devel] [RFC PATCH 6/6] meson: ipa: Build\n\tdocumentation cpp files from mojom files","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Paul,\n\nThank you for the patch.\n\nOn Mon, May 24, 2021 at 05:40:29PM +0900, Paul Elder wrote:\n> Plumb meson to build the cpp files from the mojom files for the purpose\n> of containing the documentation for the IPA interfaces.\n> \n> Signed-off-by: Paul Elder \n> ---\n> src/libcamera/ipa/meson.build | 18 +++++++++++++++---\n> 1 file changed, 15 insertions(+), 3 deletions(-)\n> \n> diff --git a/src/libcamera/ipa/meson.build b/src/libcamera/ipa/meson.build\n> index 0a16d197..0d649eed 100644\n> --- a/src/libcamera/ipa/meson.build\n> +++ b/src/libcamera/ipa/meson.build\n> @@ -1,5 +1,17 @@\n> # SPDX-License-Identifier: LGPL-2.1-or-later\n> \n> -libcamera_ipa_interfaces = files([\n> - 'core_ipa_interface.cpp',\n> -])\n> +libcamera_ipa_interfaces = []\n> +\n> +foreach file : ipa_mojom_files\n> + name = '@0@'.format(file).split('/')[-1].split('.')[0]\n\nA bit of a hack, but there's no simple way around it that I can think\nof. One option would be to use @BASENAME@ below. The second split()[]\ncould also become a .replace('.mojom', '').\n\n> +\n> + # {pipeline}_ipa_interface.cpp\n> + libcamera_ipa_interfaces += \\\n> + custom_target(name + '_ipa_interface_cpp',\n\nThis would become\n\n custom_targer('@BASENAME@_ipa_interface_cpp',\n\n> + input : file,\n> + output : name + '_ipa_interface.cpp',\n\nSimilarly here. Untested, and possibly not better.\n\nReviewed-by: Laurent Pinchart \n\n> + command : [\n> + mojom_docs_extractor,\n> + '-o', '@OUTPUT@', '@INPUT@'\n> + ])\n> +endforeach","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 636B2C3200\n\tfor ;\n\tMon, 24 May 2021 13:28:34 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DCD57601AA;\n\tMon, 24 May 2021 15:28:33 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C8C0C601AA\n\tfor ;\n\tMon, 24 May 2021 15:28:31 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 38FB3ED;\n\tMon, 24 May 2021 15:28:31 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"Luje+GS0\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1621862911;\n\tbh=g4e9ZYlxxZXthUzABT+VybYo1pkxdp2nR5jAdKh6SZU=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Luje+GS0AUh0cX1dcum8xZAH5J/mMnutrWivIZY2T+Cy6VRGKc1pW6LSfuBr8lAx1\n\tWVeXMK3Da/sg2lDewYZafZdiHeuhFBfufOqbhQBb0n6gWCy6CNOC67ptVltOb3VA+u\n\tNbFkA1j2WzjQMMpSewR01Lvc+h73jpkfVA6EdhJA=","Date":"Mon, 24 May 2021 16:28:27 +0300","From":"Laurent Pinchart ","To":"Paul Elder ","Message-ID":"","References":"<20210524084029.1179881-1-paul.elder@ideasonboard.com>\n\t<20210524084029.1179881-7-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210524084029.1179881-7-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [RFC PATCH 6/6] meson: ipa: Build\n\tdocumentation cpp files from mojom files","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":17207,"web_url":"https://patchwork.libcamera.org/comment/17207/","msgid":"","date":"2021-05-24T13:29:43","subject":"Re: [libcamera-devel] [RFC PATCH 3/6] meson: ipa: Use files() to\n\tlocate the mojom files","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Paul,\n\nThank you for the patch.\n\nOn Mon, May 24, 2021 at 05:40:26PM +0900, Paul Elder wrote:\n> Use meson's files() to list the mojom files instead of the file names\n> directly. This is so that we can still access the files from\n> src/libcamera/ipa/meson.build later for building documentation cpp\n> files from the mojom files.\n> \n> Signed-off-by: Paul Elder \n> ---\n> include/libcamera/ipa/meson.build | 10 +++++-----\n> 1 file changed, 5 insertions(+), 5 deletions(-)\n> \n> diff --git a/include/libcamera/ipa/meson.build b/include/libcamera/ipa/meson.build\n> index eca4e9ee..c7fa5cd7 100644\n> --- a/include/libcamera/ipa/meson.build\n> +++ b/include/libcamera/ipa/meson.build\n> @@ -58,12 +58,12 @@ libcamera_generated_ipa_headers += custom_target('core_ipa_serializer_h',\n> './' +'@INPUT@'\n> ])\n> \n> -ipa_mojom_files = [\n> +ipa_mojom_files = files([\n> 'ipu3.mojom',\n> 'raspberrypi.mojom',\n> 'rkisp1.mojom',\n> 'vimc.mojom',\n> -]\n> +])\n> \n> ipa_mojoms = []\n> \n> @@ -74,16 +74,16 @@ ipa_mojoms = []\n> # TODO Define per-pipeline ControlInfoMap with yaml?\n> \n> foreach file : ipa_mojom_files\n> - name = file.split('.')[0]\n> + name = '@0@'.format(file).split('/')[-1].split('.')[0]\n> \n> if name not in pipelines\n> continue\n> endif\n> \n> # {pipeline}.mojom-module\n> - mojom = custom_target(file.split('.')[0] + '_mojom_module',\n> + mojom = custom_target(name + '_mojom_module',\n> input : file,\n> - output : file + '-module',\n> + output : name + '.mojom-module',\n> depends : ipa_mojom_core,\n> command : [\n> mojom_parser,\n\nYou could also just do\n\nipa_mojom_files = files(ipa_mojom_files)\n\nbelow this loop.","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 8C785C3200\n\tfor ;\n\tMon, 24 May 2021 13:29:48 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5559F68919;\n\tMon, 24 May 2021 15:29:48 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D1C51601AA\n\tfor ;\n\tMon, 24 May 2021 15:29:47 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 5DA9EED;\n\tMon, 24 May 2021 15:29:47 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"bPL9rQlk\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1621862987;\n\tbh=/2kZ8J1PNVocffe0/No3Qx4UfLmDJsO3p6xc1hvdFQY=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=bPL9rQlkCfhduaJTEzHzniOODXvZTZzH4kTUjWlatqVhHgZzOjk+OrMxqkINo2OI4\n\t2p6urp31E5yLXopU99oLbvNkEsAhKejLVhhaYKEK4Tveke+s+Xq7IvIdTYsYqjmdi3\n\t5dAz2ezKr3peAclEc9QGtDgvwlTYKl2CGFsi4kEc=","Date":"Mon, 24 May 2021 16:29:43 +0300","From":"Laurent Pinchart ","To":"Paul Elder ","Message-ID":"","References":"<20210524084029.1179881-1-paul.elder@ideasonboard.com>\n\t<20210524084029.1179881-4-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210524084029.1179881-4-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [RFC PATCH 3/6] meson: ipa: Use files() to\n\tlocate the mojom files","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":17236,"web_url":"https://patchwork.libcamera.org/comment/17236/","msgid":"<20210525094627.GB1189297@pyrite.rasen.tech>","date":"2021-05-25T09:46:27","subject":"Re: [libcamera-devel] [RFC PATCH 6/6] meson: ipa: Build\n\tdocumentation cpp files from mojom files","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"Hi Laurent,\n\nOn Mon, May 24, 2021 at 04:28:27PM +0300, Laurent Pinchart wrote:\n> Hi Paul,\n> \n> Thank you for the patch.\n> \n> On Mon, May 24, 2021 at 05:40:29PM +0900, Paul Elder wrote:\n> > Plumb meson to build the cpp files from the mojom files for the purpose\n> > of containing the documentation for the IPA interfaces.\n> > \n> > Signed-off-by: Paul Elder \n> > ---\n> > src/libcamera/ipa/meson.build | 18 +++++++++++++++---\n> > 1 file changed, 15 insertions(+), 3 deletions(-)\n> > \n> > diff --git a/src/libcamera/ipa/meson.build b/src/libcamera/ipa/meson.build\n> > index 0a16d197..0d649eed 100644\n> > --- a/src/libcamera/ipa/meson.build\n> > +++ b/src/libcamera/ipa/meson.build\n> > @@ -1,5 +1,17 @@\n> > # SPDX-License-Identifier: LGPL-2.1-or-later\n> > \n> > -libcamera_ipa_interfaces = files([\n> > - 'core_ipa_interface.cpp',\n> > -])\n> > +libcamera_ipa_interfaces = []\n> > +\n> > +foreach file : ipa_mojom_files\n> > + name = '@0@'.format(file).split('/')[-1].split('.')[0]\n> \n> A bit of a hack, but there's no simple way around it that I can think\n\nYeah :/\n\n> of. One option would be to use @BASENAME@ below. The second split()[]\n\nERROR: Tried to create target \"@BASENAME@_ipa_interface_cpp\", but a\ntarget of that name already exists.\n\n> could also become a .replace('.mojom', '').\n\nERROR: Unknown method \"replace\" for a string.\n\n> \n> > +\n> > + # {pipeline}_ipa_interface.cpp\n> > + libcamera_ipa_interfaces += \\\n> > + custom_target(name + '_ipa_interface_cpp',\n> \n> This would become\n> \n> custom_targer('@BASENAME@_ipa_interface_cpp',\n> \n> > + input : file,\n> > + output : name + '_ipa_interface.cpp',\n> \n> Similarly here. Untested, and possibly not better.\n\nI think I'll keep what I have here :/\n\n> \n> Reviewed-by: Laurent Pinchart \n\n\nThanks,\n\nPaul\n\n> \n> > + command : [\n> > + mojom_docs_extractor,\n> > + '-o', '@OUTPUT@', '@INPUT@'\n> > + ])\n> > +endforeach","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id F18A6C3200\n\tfor ;\n\tTue, 25 May 2021 09:46:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AFEB468925;\n\tTue, 25 May 2021 11:46:36 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 892D9602AF\n\tfor ;\n\tTue, 25 May 2021 11:46:35 +0200 (CEST)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 324BA344;\n\tTue, 25 May 2021 11:46:33 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"ez9LCV15\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1621935995;\n\tbh=eopP57cFLrxwSMB9xixj+42fSITMByXm5sLshcQ1fB0=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=ez9LCV15s/rTaiAY5A4Iiv+rW5JUkSDqDkJfwcOYm2uLjEDQ+Su/PvJe2HlMnZwW2\n\ttynhsEmdnu3j9dz97xTDj8rXHdNg5hkQEd2mqgMRJIYmzcoh3WY9dU4ALnAL8A8aRz\n\tE+I4J0rBJzIvS3nM0PTUe8ZBzxq0deV/ggssUACg=","Date":"Tue, 25 May 2021 18:46:27 +0900","From":"paul.elder@ideasonboard.com","To":"Laurent Pinchart ","Message-ID":"<20210525094627.GB1189297@pyrite.rasen.tech>","References":"<20210524084029.1179881-1-paul.elder@ideasonboard.com>\n\t<20210524084029.1179881-7-paul.elder@ideasonboard.com>\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"","Subject":"Re: [libcamera-devel] [RFC PATCH 6/6] meson: ipa: Build\n\tdocumentation cpp files from mojom files","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]