[{"id":1677,"web_url":"https://patchwork.libcamera.org/comment/1677/","msgid":"","date":"2019-05-23T10:11:33","subject":"Re: [libcamera-devel] [PATCH v3 3/3] libcamera: Auto-generate\n\tlibcamera.h","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 22/05/2019 22:22, Laurent Pinchart wrote:\n> As shown by two missing includes, keeping the libcamera.h file in sync\n> when adding or removing headers is an error-prone manual process.\n> Automate it by generating the header automatically.\n> \n\n\\o/ Still love this patch :-D\n\n> The libcamera.h header is also added to the libcamera dependency\n> libcamera_dep to ensure that the headers gets generated before any\n> source depending on it gets compiled.\n> \n\nA question below - but :\n\nReviewed-by: Kieran Bingham \n\n> Signed-off-by: Laurent Pinchart \n> ---\n> include/libcamera/gen-header.sh | 27 +++++++++++++++++++++++++++\n> include/libcamera/libcamera.h | 20 --------------------\n> include/libcamera/meson.build | 10 +++++++++-\n> src/libcamera/meson.build | 2 +-\n> 4 files changed, 37 insertions(+), 22 deletions(-)\n> create mode 100755 include/libcamera/gen-header.sh\n> delete mode 100644 include/libcamera/libcamera.h\n> \n> diff --git a/include/libcamera/gen-header.sh b/include/libcamera/gen-header.sh\n> new file mode 100755\n> index 000000000000..e171c08c20b8\n> --- /dev/null\n> +++ b/include/libcamera/gen-header.sh\n> @@ -0,0 +1,27 @@\n> +#!/bin/sh\n> +\n> +src_dir=\"$1\"\n> +dst_file=\"$2\"\n> +\n> +cat < \"$dst_file\"\n> +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> +/* This file is auto-generated, do not edit! */\n> +/*\n> + * Copyright (C) 2018-2019, Google Inc.\n> + *\n> + * libcamera.h - libcamera public API\n> + */\n> +#ifndef __LIBCAMERA_LIBCAMERA_H__\n> +#define __LIBCAMERA_LIBCAMERA_H__\n> +\n> +EOF\n> +\n> +for header in \"$src_dir\"/*.h ; do\n> +\theader=$(basename \"$header\")\n> +\techo \"#include \" >> \"$dst_file\"\n> +done\n> +\n> +cat <> \"$dst_file\"\n> +\n> +#endif /* __LIBCAMERA_LIBCAMERA_H__ */\n> +EOF\n> diff --git a/include/libcamera/libcamera.h b/include/libcamera/libcamera.h\n> deleted file mode 100644\n> index dda576e906fb..000000000000\n> --- a/include/libcamera/libcamera.h\n> +++ /dev/null\n> @@ -1,20 +0,0 @@\n> -/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> -/*\n> - * Copyright (C) 2018, Google Inc.\n> - *\n> - * libcamera.h - libcamera public API\n> - */\n> -#ifndef __LIBCAMERA_LIBCAMERA_H__\n> -#define __LIBCAMERA_LIBCAMERA_H__\n> -\n> -#include \n> -#include \n> -#include \n> -#include \n> -#include \n> -#include \n> -#include \n> -#include \n> -#include \n> -\n> -#endif /* __LIBCAMERA_LIBCAMERA_H__ */\n> diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build\n> index cb64f0ca0f8b..1fcf6b509a1e 100644\n> --- a/include/libcamera/meson.build\n> +++ b/include/libcamera/meson.build\n> @@ -6,7 +6,6 @@ libcamera_api = files([\n> 'event_notifier.h',\n> 'geometry.h',\n> 'ipa/ipa_module_info.h',\n> - 'libcamera.h',\n> 'object.h',\n> 'request.h',\n> 'signal.h',\n> @@ -14,5 +13,14 @@ libcamera_api = files([\n> 'timer.h',\n> ])\n> \n> +gen_header = join_paths(meson.current_source_dir(), 'gen-header.sh')\n> +\n> +libcamera_h = custom_target('gen-header',\n> + input : 'meson.build',\n> + output : 'libcamera.h',\n> + command : [gen_header, meson.current_source_dir(), '@OUTPUT@'],\n> + install : true,\n> + install_dir : 'include/libcamera')\n\nI'm fine with it staying explicit, but doesn't this file already install\nto include/libcamera because it is the current working directory and the\nlocation that the generated file will be output ?\n\n> +\n> install_headers(libcamera_api,\n> subdir : 'libcamera')\n> diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\n> index 0ebb25bcb821..6a73580d71f5 100644\n> --- a/src/libcamera/meson.build\n> +++ b/src/libcamera/meson.build\n> @@ -66,6 +66,6 @@ libcamera = shared_library('camera',\n> include_directories : includes,\n> dependencies : libudev)\n> \n> -libcamera_dep = declare_dependency(sources : libcamera_api,\n> +libcamera_dep = declare_dependency(sources : [libcamera_api, libcamera_h],\n> include_directories : libcamera_includes,\n> link_with : libcamera)\n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7300260BBB\n\tfor ;\n\tThu, 23 May 2019 12:11:37 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C8D40322;\n\tThu, 23 May 2019 12:11:36 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1558606297;\n\tbh=GRPBZohvAfM4PP7Kr+n1PQLFbmhZc4WHkX5ncXMHXeA=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=YFyx/r79JDjxo5+Tk1c9bDZOI8kQZgw0m5N/A4e8GHKeHSqPfJEAizsCgN1o6lqxi\n\tbJrI9/Z4bg7AezzhPx4lD6S/3YCeHefrfuShPdszkcRoUZXXw4AuGfkMpyIn9yto4p\n\tmtDwB3bcIA0Q2VDFzc6Pqmx5DU6XdVM/0iJg6UBA=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20190522212253.3307-1-laurent.pinchart@ideasonboard.com>\n\t<20190522212253.3307-3-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tsbsRB8KNNvVXBOVNwko86rQqF9drZuw=","Organization":"Ideas on Board","Message-ID":"","Date":"Thu, 23 May 2019 11:11:33 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.6.1","MIME-Version":"1.0","In-Reply-To":"<20190522212253.3307-3-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH v3 3/3] libcamera: Auto-generate\n\tlibcamera.h","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 23 May 2019 10:11:37 -0000"}},{"id":1680,"web_url":"https://patchwork.libcamera.org/comment/1680/","msgid":"<20190523104209.GK4745@pendragon.ideasonboard.com>","date":"2019-05-23T10:42:09","subject":"Re: [libcamera-devel] [PATCH v3 3/3] libcamera: Auto-generate\n\tlibcamera.h","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nOn Thu, May 23, 2019 at 11:11:33AM +0100, Kieran Bingham wrote:\n> On 22/05/2019 22:22, Laurent Pinchart wrote:\n> > As shown by two missing includes, keeping the libcamera.h file in sync\n> > when adding or removing headers is an error-prone manual process.\n> > Automate it by generating the header automatically.\n> > \n> \n> \\o/ Still love this patch :-D\n> \n> > The libcamera.h header is also added to the libcamera dependency\n> > libcamera_dep to ensure that the headers gets generated before any\n> > source depending on it gets compiled.\n> \n> A question below - but :\n> \n> Reviewed-by: Kieran Bingham \n> \n> > Signed-off-by: Laurent Pinchart \n> > ---\n> > include/libcamera/gen-header.sh | 27 +++++++++++++++++++++++++++\n> > include/libcamera/libcamera.h | 20 --------------------\n> > include/libcamera/meson.build | 10 +++++++++-\n> > src/libcamera/meson.build | 2 +-\n> > 4 files changed, 37 insertions(+), 22 deletions(-)\n> > create mode 100755 include/libcamera/gen-header.sh\n> > delete mode 100644 include/libcamera/libcamera.h\n> > \n> > diff --git a/include/libcamera/gen-header.sh b/include/libcamera/gen-header.sh\n> > new file mode 100755\n> > index 000000000000..e171c08c20b8\n> > --- /dev/null\n> > +++ b/include/libcamera/gen-header.sh\n> > @@ -0,0 +1,27 @@\n> > +#!/bin/sh\n> > +\n> > +src_dir=\"$1\"\n> > +dst_file=\"$2\"\n> > +\n> > +cat < \"$dst_file\"\n> > +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> > +/* This file is auto-generated, do not edit! */\n> > +/*\n> > + * Copyright (C) 2018-2019, Google Inc.\n> > + *\n> > + * libcamera.h - libcamera public API\n> > + */\n> > +#ifndef __LIBCAMERA_LIBCAMERA_H__\n> > +#define __LIBCAMERA_LIBCAMERA_H__\n> > +\n> > +EOF\n> > +\n> > +for header in \"$src_dir\"/*.h ; do\n> > +\theader=$(basename \"$header\")\n> > +\techo \"#include \" >> \"$dst_file\"\n> > +done\n> > +\n> > +cat <> \"$dst_file\"\n> > +\n> > +#endif /* __LIBCAMERA_LIBCAMERA_H__ */\n> > +EOF\n> > diff --git a/include/libcamera/libcamera.h b/include/libcamera/libcamera.h\n> > deleted file mode 100644\n> > index dda576e906fb..000000000000\n> > --- a/include/libcamera/libcamera.h\n> > +++ /dev/null\n> > @@ -1,20 +0,0 @@\n> > -/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> > -/*\n> > - * Copyright (C) 2018, Google Inc.\n> > - *\n> > - * libcamera.h - libcamera public API\n> > - */\n> > -#ifndef __LIBCAMERA_LIBCAMERA_H__\n> > -#define __LIBCAMERA_LIBCAMERA_H__\n> > -\n> > -#include \n> > -#include \n> > -#include \n> > -#include \n> > -#include \n> > -#include \n> > -#include \n> > -#include \n> > -#include \n> > -\n> > -#endif /* __LIBCAMERA_LIBCAMERA_H__ */\n> > diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build\n> > index cb64f0ca0f8b..1fcf6b509a1e 100644\n> > --- a/include/libcamera/meson.build\n> > +++ b/include/libcamera/meson.build\n> > @@ -6,7 +6,6 @@ libcamera_api = files([\n> > 'event_notifier.h',\n> > 'geometry.h',\n> > 'ipa/ipa_module_info.h',\n> > - 'libcamera.h',\n> > 'object.h',\n> > 'request.h',\n> > 'signal.h',\n> > @@ -14,5 +13,14 @@ libcamera_api = files([\n> > 'timer.h',\n> > ])\n> > \n> > +gen_header = join_paths(meson.current_source_dir(), 'gen-header.sh')\n> > +\n> > +libcamera_h = custom_target('gen-header',\n> > + input : 'meson.build',\n> > + output : 'libcamera.h',\n> > + command : [gen_header, meson.current_source_dir(), '@OUTPUT@'],\n> > + install : true,\n> > + install_dir : 'include/libcamera')\n> \n> I'm fine with it staying explicit, but doesn't this file already install\n> to include/libcamera because it is the current working directory and the\n> location that the generated file will be output ?\n\ninclude/libcamera/meson.build:18:0: ERROR: \"install_dir\" must be specified when installing a target\n\nSo, no :-)\n\n> > +\n> > install_headers(libcamera_api,\n> > subdir : 'libcamera')\n> > diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\n> > index 0ebb25bcb821..6a73580d71f5 100644\n> > --- a/src/libcamera/meson.build\n> > +++ b/src/libcamera/meson.build\n> > @@ -66,6 +66,6 @@ libcamera = shared_library('camera',\n> > include_directories : includes,\n> > dependencies : libudev)\n> > \n> > -libcamera_dep = declare_dependency(sources : libcamera_api,\n> > +libcamera_dep = declare_dependency(sources : [libcamera_api, libcamera_h],\n> > include_directories : libcamera_includes,\n> > link_with : libcamera)\n> >","headers":{"Return-Path":"","Received":["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 268C160BBB\n\tfor ;\n\tThu, 23 May 2019 12:42:27 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 87C97583;\n\tThu, 23 May 2019 12:42:26 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1558608146;\n\tbh=i01lOyPWno6cDzbUFziCYazkIi1Ts8ibNLiqfMiH96s=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=wa01nWCzA6bwkkfMKiuq+x1AoWyny7ckhyMxCXpVs231OBDUvUv3ANd1lfFYELe1T\n\tYrfHLtgSliTnhSqlc2TMN7E+1IX7/7kniEQ97t6xkeCDGOQUbiYDQ5RtqXwMHTc25C\n\t3Ayv6MJC2fuxj0+Ow5hHivIgO6IWWWZd4VCFbKFE=","Date":"Thu, 23 May 2019 13:42:09 +0300","From":"Laurent Pinchart ","To":"Kieran Bingham ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190523104209.GK4745@pendragon.ideasonboard.com>","References":"<20190522212253.3307-1-laurent.pinchart@ideasonboard.com>\n\t<20190522212253.3307-3-laurent.pinchart@ideasonboard.com>\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH v3 3/3] libcamera: Auto-generate\n\tlibcamera.h","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 23 May 2019 10:42:27 -0000"}}]