[{"id":30811,"web_url":"https://patchwork.libcamera.org/comment/30811/","msgid":"","date":"2024-08-14T21:51:48","subject":"Re: [PATCH 02/10] meson: Fix mismatch in controls and properties\n\tgenerated file names","submitter":{"id":156,"url":"https://patchwork.libcamera.org/api/people/156/","name":"Dan Scally","email":"dan.scally@ideasonboard.com"},"content":"Hi Laurent\n\nOn 09/08/2024 01:59, Laurent Pinchart wrote:\n> The header for controls and properties are generated from the\n> control_ids.h.in and property_ids.h.in templates respectively, and the\n> generated files are named control_ids.h and property_ids.h.\n>\n> For sources, the templates are named control_ids.cpp.in and\n> property_ids.cpp.in, but the output files are named controls_ids.cpp and\n> properties_ids.cpp. This discrepancy causes confusion. Fix it.\n>\n> Signed-off-by: Laurent Pinchart \n> ---\nReviewed-by: Daniel Scally \n> src/libcamera/meson.build | 22 +++++++++++++---------\n> 1 file changed, 13 insertions(+), 9 deletions(-)\n>\n> diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\n> index 79b8cbaf1311..e5e959d9c7bd 100644\n> --- a/src/libcamera/meson.build\n> +++ b/src/libcamera/meson.build\n> @@ -129,21 +129,25 @@ endif\n> control_sources = []\n> \n> controls_mode_files = {\n> - 'controls' : controls_files,\n> - 'properties' : properties_files,\n> + 'controls': [\n> + controls_files,\n> + 'control_ids.cpp',\n> + ],\n> + 'properties': [\n> + properties_files,\n> + 'property_ids.cpp',\n> + ],\n> }\n> \n> -foreach mode, input_files : controls_mode_files\n> - if mode == 'controls'\n> - template_file = files('control_ids.cpp.in')\n> - else\n> - template_file = files('property_ids.cpp.in')\n> - endif\n> +foreach mode, inout_files : controls_mode_files\n> + input_files = inout_files[0]\n> + output_file = inout_files[1]\n> \n> + template_file = files(output_file + '.in')\n> ranges_file = files('control_ranges.yaml')\n> control_sources += custom_target(mode + '_cpp',\n> input : input_files,\n> - output : mode + '_ids.cpp',\n> + output : output_file,\n> command : [gen_controls, '-o', '@OUTPUT@',\n> '--mode', mode, '-t', template_file,\n> '-r', ranges_file, '@INPUT@'])","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 E141AC323E\n\tfor ;\n\tWed, 14 Aug 2024 21:51:52 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2B018633BD;\n\tWed, 14 Aug 2024 23:51:52 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 83AEF6337E\n\tfor ;\n\tWed, 14 Aug 2024 23:51:51 +0200 (CEST)","from [192.168.0.43]\n\t(cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net [86.13.91.161])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8E79966F\n\tfor ;\n\tWed, 14 Aug 2024 23:50:53 +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=\"uf9Dj4Ux\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1723672253;\n\tbh=rfTswJxZpzSoi7QIgQeRzFn7nis2s8FQ2ql2gLj56e4=;\n\th=Date:Subject:To:References:From:In-Reply-To:From;\n\tb=uf9Dj4UxR6tY+pKKL15eRcVQ/GI8/5wemoqA/EHMnGLx6cpLNT9PJItTQ7evuBSZK\n\tDtayf7P6SI/ARRDSGXlEfVNhGoR6BaH0KrydBY4ZkaJt3V9n8k0Iyi/Z3/WyEQhmb4\n\t2rOYTAG+C8Vc6ENlfjwFkN075qJ70fx92UFiNTCc=","Message-ID":"","Date":"Wed, 14 Aug 2024 22:51:48 +0100","MIME-Version":"1.0","User-Agent":"Mozilla Thunderbird","Subject":"Re: [PATCH 02/10] meson: Fix mismatch in controls and properties\n\tgenerated file names","To":"libcamera-devel@lists.libcamera.org","References":"<20240809005914.20662-1-laurent.pinchart@ideasonboard.com>\n\t<20240809005914.20662-3-laurent.pinchart@ideasonboard.com>","Content-Language":"en-US","From":"Dan Scally ","Autocrypt":"addr=dan.scally@ideasonboard.com; keydata=\n\t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","In-Reply-To":"<20240809005914.20662-3-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=UTF-8; format=flowed","Content-Transfer-Encoding":"7bit","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":30826,"web_url":"https://patchwork.libcamera.org/comment/30826/","msgid":"","date":"2024-08-15T01:37:53","subject":"Re: [PATCH 02/10] meson: Fix mismatch in controls and properties\n\tgenerated file names","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"On Fri, Aug 09, 2024 at 03:59:06AM +0300, Laurent Pinchart wrote:\n> The header for controls and properties are generated from the\n> control_ids.h.in and property_ids.h.in templates respectively, and the\n> generated files are named control_ids.h and property_ids.h.\n> \n> For sources, the templates are named control_ids.cpp.in and\n> property_ids.cpp.in, but the output files are named controls_ids.cpp and\n> properties_ids.cpp. This discrepancy causes confusion. Fix it.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Paul Elder \n\n> ---\n> src/libcamera/meson.build | 22 +++++++++++++---------\n> 1 file changed, 13 insertions(+), 9 deletions(-)\n> \n> diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\n> index 79b8cbaf1311..e5e959d9c7bd 100644\n> --- a/src/libcamera/meson.build\n> +++ b/src/libcamera/meson.build\n> @@ -129,21 +129,25 @@ endif\n> control_sources = []\n> \n> controls_mode_files = {\n> - 'controls' : controls_files,\n> - 'properties' : properties_files,\n> + 'controls': [\n> + controls_files,\n> + 'control_ids.cpp',\n> + ],\n> + 'properties': [\n> + properties_files,\n> + 'property_ids.cpp',\n> + ],\n> }\n> \n> -foreach mode, input_files : controls_mode_files\n> - if mode == 'controls'\n> - template_file = files('control_ids.cpp.in')\n> - else\n> - template_file = files('property_ids.cpp.in')\n> - endif\n> +foreach mode, inout_files : controls_mode_files\n> + input_files = inout_files[0]\n> + output_file = inout_files[1]\n> \n> + template_file = files(output_file + '.in')\n> ranges_file = files('control_ranges.yaml')\n> control_sources += custom_target(mode + '_cpp',\n> input : input_files,\n> - output : mode + '_ids.cpp',\n> + output : output_file,\n> command : [gen_controls, '-o', '@OUTPUT@',\n> '--mode', mode, '-t', template_file,\n> '-r', ranges_file, '@INPUT@'])","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 284F9C323E\n\tfor ;\n\tThu, 15 Aug 2024 01:38:02 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E468F633BD;\n\tThu, 15 Aug 2024 03:38:00 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 015D663382\n\tfor ;\n\tThu, 15 Aug 2024 03:37:59 +0200 (CEST)","from pyrite.rasen.tech (h175-177-049-024.catv02.itscom.jp\n\t[175.177.49.24])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id BC1BFA34;\n\tThu, 15 Aug 2024 03:37:00 +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=\"wYsBrYpS\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1723685821;\n\tbh=4zlC0MBogYRH1MImB/x+EwABm6NOd9mFj6GvOqnYaRo=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=wYsBrYpS6K6a3qT0ymxGZioiH/uQt3but6/0T5+zt2kW0BOaqNUWBqR1EUXOsy5Mt\n\tnue+fwUnBSAoyDOVZSZAIORYnVpUCIN5SumfFlqvnRe03GEm/w4419KYV0TXkwpDIp\n\tsYK+xTnZ7DAUd3rRLRZFUEdfX/zKcYWNrKyQnVmk=","Date":"Thu, 15 Aug 2024 10:37:53 +0900","From":"Paul Elder ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Subject":"Re: [PATCH 02/10] meson: Fix mismatch in controls and properties\n\tgenerated file names","Message-ID":"","References":"<20240809005914.20662-1-laurent.pinchart@ideasonboard.com>\n\t<20240809005914.20662-3-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<20240809005914.20662-3-laurent.pinchart@ideasonboard.com>","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]