[{"id":22853,"web_url":"https://patchwork.libcamera.org/comment/22853/","msgid":"<165175386222.1217485.8480556512248851092@Monstersaurus>","date":"2022-05-05T12:31:02","subject":"Re: [libcamera-devel] [PATCH v7 02/13] meson: use new\n\tproject_*_root() functions","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Tomi Valkeinen (2022-05-05 11:40:53)\n> meson.source_root() and meson.build_root() are deprecated. Use\n> meson.project_source_root() and meson.project_build_root() instead.\n> \n\nAha - great, this was on my radar to do some day, so I'm happy that\nyou've beaten me to it!\n\n\nReviewed-by: Kieran Bingham \n\n> Signed-off-by: Tomi Valkeinen \n> ---\n> Documentation/meson.build | 4 ++--\n> include/libcamera/ipa/meson.build | 8 ++++----\n> meson.build | 6 +++---\n> src/libcamera/meson.build | 4 ++--\n> .../include/libcamera/ipa/meson.build | 4 ++--\n> 5 files changed, 13 insertions(+), 13 deletions(-)\n> \n> diff --git a/Documentation/meson.build b/Documentation/meson.build\n> index 33af82aa..8e2eacc6 100644\n> --- a/Documentation/meson.build\n> +++ b/Documentation/meson.build\n> @@ -12,8 +12,8 @@ dot = find_program('dot', required : get_option('documentation'))\n> if doxygen.found() and dot.found()\n> cdata = configuration_data()\n> cdata.set('VERSION', 'v@0@'.format(libcamera_git_version))\n> - cdata.set('TOP_SRCDIR', meson.source_root())\n> - cdata.set('TOP_BUILDDIR', meson.build_root())\n> + cdata.set('TOP_SRCDIR', meson.project_source_root())\n> + cdata.set('TOP_BUILDDIR', meson.project_build_root())\n> \n> doxyfile = configure_file(input : 'Doxyfile.in',\n> output : 'Doxyfile',\n> diff --git a/include/libcamera/ipa/meson.build b/include/libcamera/ipa/meson.build\n> index 6ea94fb5..442ca3dd 100644\n> --- a/include/libcamera/ipa/meson.build\n> +++ b/include/libcamera/ipa/meson.build\n> @@ -25,8 +25,8 @@ ipa_mojom_core = custom_target(core_mojom_file.split('.')[0] + '_mojom_module',\n> output : core_mojom_file + '-module',\n> command : [\n> mojom_parser,\n> - '--output-root', meson.build_root(),\n> - '--input-root', meson.source_root(),\n> + '--output-root', meson.project_build_root(),\n> + '--input-root', meson.project_source_root(),\n> '--mojoms', '@INPUT@'\n> ])\n> \n> @@ -89,8 +89,8 @@ foreach file : ipa_mojom_files\n> depends : ipa_mojom_core,\n> command : [\n> mojom_parser,\n> - '--output-root', meson.build_root(),\n> - '--input-root', meson.source_root(),\n> + '--output-root', meson.project_build_root(),\n> + '--input-root', meson.project_source_root(),\n> '--mojoms', '@INPUT@'\n> ])\n> \n> diff --git a/meson.build b/meson.build\n> index b892ba84..10ad8c5c 100644\n> --- a/meson.build\n> +++ b/meson.build\n> @@ -17,8 +17,8 @@ project('libcamera', 'c', 'cpp',\n> # git version tag, the build metadata (e.g. +211-c94a24f4) is omitted from\n> # libcamera_git_version.\n> libcamera_git_version = run_command('utils/gen-version.sh',\n> - meson.build_root(),\n> - meson.source_root()).stdout().strip()\n> + meson.project_build_root(),\n> + meson.project_source_root()).stdout().strip()\n> if libcamera_git_version == ''\n> libcamera_git_version = meson.project_version()\n> endif\n> @@ -160,7 +160,7 @@ endif\n> # Create a symlink from the build root to the source root. This is used when\n> # running libcamera from the build directory to locate resources in the source\n> # directory (such as IPA configuration files).\n> -run_command('ln', '-fsT', meson.source_root(), meson.build_root() / 'source')\n> +run_command('ln', '-fsT', meson.project_source_root(), meson.project_build_root() / 'source')\n> \n> configure_file(output : 'config.h', configuration : config_h)\n> \n> diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\n> index 26912ca1..d6a78760 100644\n> --- a/src/libcamera/meson.build\n> +++ b/src/libcamera/meson.build\n> @@ -98,11 +98,11 @@ endforeach\n> \n> libcamera_sources += control_sources\n> \n> -gen_version = meson.source_root() / 'utils' / 'gen-version.sh'\n> +gen_version = meson.project_source_root() / 'utils' / 'gen-version.sh'\n> \n> # Use vcs_tag() and not configure_file() or run_command(), to ensure that the\n> # version gets updated with every ninja build and not just at meson setup time.\n> -version_cpp = vcs_tag(command : [gen_version, meson.build_root(), meson.source_root()],\n> +version_cpp = vcs_tag(command : [gen_version, meson.project_build_root(), meson.project_source_root()],\n> input : 'version.cpp.in',\n> output : 'version.cpp',\n> fallback : meson.project_version())\n> diff --git a/test/serialization/generated_serializer/include/libcamera/ipa/meson.build b/test/serialization/generated_serializer/include/libcamera/ipa/meson.build\n> index ba198f7a..6f8794c1 100644\n> --- a/test/serialization/generated_serializer/include/libcamera/ipa/meson.build\n> +++ b/test/serialization/generated_serializer/include/libcamera/ipa/meson.build\n> @@ -6,8 +6,8 @@ mojom = custom_target('test_mojom_module',\n> output : 'test.mojom-module',\n> command : [\n> mojom_parser,\n> - '--output-root', meson.build_root(),\n> - '--input-root', meson.source_root(),\n> + '--output-root', meson.project_build_root(),\n> + '--input-root', meson.project_source_root(),\n> '--mojoms', '@INPUT@'\n> ])\n> \n> -- \n> 2.34.1\n>","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 B3AEDC0F2A\n\tfor ;\n\tThu, 5 May 2022 12:31:05 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6A6E765643;\n\tThu, 5 May 2022 14:31:05 +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 1C64C603AB\n\tfor ;\n\tThu, 5 May 2022 14:31:04 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C9FFC4A8;\n\tThu, 5 May 2022 14:31:03 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1651753865;\n\tbh=AMyTL5sTGYPq5HXXVLiEuv0ILq2P2cD5d3BYiZTCbCE=;\n\th=In-Reply-To:References:To:Date:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=Qxhc2alIQO6negQUDJY2rVo+lEkQ46JSujwXrth2Kr3z147ShrfZ3aLR4/A76utBQ\n\tIK4J+Xbxwd4bbikXqs2Y/vESwvAW1plXf5I9Ud39D5rEb+71af92PztqwrAEoHTy4C\n\tBWrpRBqu0NxUb8RVfhrxfq9uuHBNhMZln6sObTCGxv/36G4SHP3eqwOzPHjM4BnCIO\n\tSnPtzHbDRbQ1LaaWtr22qfw0rKGbARuAo775IWKRx2fa9AVx5hXHNsHqXmmQHLQzH5\n\tAv3Rwhh6KFnf6DXHB/jzyC52VC2QP7yvS3qjIMHOfI94fT4grFfly4X0h7PtGauY75\n\thaEKTzZeZJbzg==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1651753863;\n\tbh=AMyTL5sTGYPq5HXXVLiEuv0ILq2P2cD5d3BYiZTCbCE=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=u5pnAHugkUX0c9aJtiDJf1skKlqdoxIBBRKKdr1FAPeGchC97TqaSJw33Vr7GtIkY\n\tlUPdTNrt+Q/fzrrSDbYnbeI8HKoFC2Qw8IXdaQRDFss15RzdGqbK6DZOZqTH8+TCiC\n\tDz/ZQ0/i3ZWmONrWjIS7BBVtHTJjZTRF+hmmC4RY="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"u5pnAHug\"; dkim-atps=neutral","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20220505104104.70841-3-tomi.valkeinen@ideasonboard.com>","References":"<20220505104104.70841-1-tomi.valkeinen@ideasonboard.com>\n\t<20220505104104.70841-3-tomi.valkeinen@ideasonboard.com>","To":"David Plowman ,\n\tJacopo Mondi ,\n\tLaurent Pinchart ,\n\tTomi Valkeinen ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Thu, 05 May 2022 13:31:02 +0100","Message-ID":"<165175386222.1217485.8480556512248851092@Monstersaurus>","User-Agent":"alot/0.10","Subject":"Re: [libcamera-devel] [PATCH v7 02/13] meson: use new\n\tproject_*_root() functions","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","From":"Kieran Bingham via libcamera-devel\n\t","Reply-To":"Kieran Bingham ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":22861,"web_url":"https://patchwork.libcamera.org/comment/22861/","msgid":"","date":"2022-05-05T15:51:38","subject":"Re: [libcamera-devel] [PATCH v7 02/13] meson: use new\n\tproject_*_root() functions","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"On Thu, May 05, 2022 at 01:31:02PM +0100, Kieran Bingham wrote:\n> Quoting Tomi Valkeinen (2022-05-05 11:40:53)\n> > meson.source_root() and meson.build_root() are deprecated. Use\n> > meson.project_source_root() and meson.project_build_root() instead.\n> \n> Aha - great, this was on my radar to do some day, so I'm happy that\n> you've beaten me to it!\n> \n> Reviewed-by: Kieran Bingham \n\nReviewed-by: Laurent Pinchart \n\n> > Signed-off-by: Tomi Valkeinen \n> > ---\n> > Documentation/meson.build | 4 ++--\n> > include/libcamera/ipa/meson.build | 8 ++++----\n> > meson.build | 6 +++---\n> > src/libcamera/meson.build | 4 ++--\n> > .../include/libcamera/ipa/meson.build | 4 ++--\n> > 5 files changed, 13 insertions(+), 13 deletions(-)\n> > \n> > diff --git a/Documentation/meson.build b/Documentation/meson.build\n> > index 33af82aa..8e2eacc6 100644\n> > --- a/Documentation/meson.build\n> > +++ b/Documentation/meson.build\n> > @@ -12,8 +12,8 @@ dot = find_program('dot', required : get_option('documentation'))\n> > if doxygen.found() and dot.found()\n> > cdata = configuration_data()\n> > cdata.set('VERSION', 'v@0@'.format(libcamera_git_version))\n> > - cdata.set('TOP_SRCDIR', meson.source_root())\n> > - cdata.set('TOP_BUILDDIR', meson.build_root())\n> > + cdata.set('TOP_SRCDIR', meson.project_source_root())\n> > + cdata.set('TOP_BUILDDIR', meson.project_build_root())\n> > \n> > doxyfile = configure_file(input : 'Doxyfile.in',\n> > output : 'Doxyfile',\n> > diff --git a/include/libcamera/ipa/meson.build b/include/libcamera/ipa/meson.build\n> > index 6ea94fb5..442ca3dd 100644\n> > --- a/include/libcamera/ipa/meson.build\n> > +++ b/include/libcamera/ipa/meson.build\n> > @@ -25,8 +25,8 @@ ipa_mojom_core = custom_target(core_mojom_file.split('.')[0] + '_mojom_module',\n> > output : core_mojom_file + '-module',\n> > command : [\n> > mojom_parser,\n> > - '--output-root', meson.build_root(),\n> > - '--input-root', meson.source_root(),\n> > + '--output-root', meson.project_build_root(),\n> > + '--input-root', meson.project_source_root(),\n> > '--mojoms', '@INPUT@'\n> > ])\n> > \n> > @@ -89,8 +89,8 @@ foreach file : ipa_mojom_files\n> > depends : ipa_mojom_core,\n> > command : [\n> > mojom_parser,\n> > - '--output-root', meson.build_root(),\n> > - '--input-root', meson.source_root(),\n> > + '--output-root', meson.project_build_root(),\n> > + '--input-root', meson.project_source_root(),\n> > '--mojoms', '@INPUT@'\n> > ])\n> > \n> > diff --git a/meson.build b/meson.build\n> > index b892ba84..10ad8c5c 100644\n> > --- a/meson.build\n> > +++ b/meson.build\n> > @@ -17,8 +17,8 @@ project('libcamera', 'c', 'cpp',\n> > # git version tag, the build metadata (e.g. +211-c94a24f4) is omitted from\n> > # libcamera_git_version.\n> > libcamera_git_version = run_command('utils/gen-version.sh',\n> > - meson.build_root(),\n> > - meson.source_root()).stdout().strip()\n> > + meson.project_build_root(),\n> > + meson.project_source_root()).stdout().strip()\n> > if libcamera_git_version == ''\n> > libcamera_git_version = meson.project_version()\n> > endif\n> > @@ -160,7 +160,7 @@ endif\n> > # Create a symlink from the build root to the source root. This is used when\n> > # running libcamera from the build directory to locate resources in the source\n> > # directory (such as IPA configuration files).\n> > -run_command('ln', '-fsT', meson.source_root(), meson.build_root() / 'source')\n> > +run_command('ln', '-fsT', meson.project_source_root(), meson.project_build_root() / 'source')\n> > \n> > configure_file(output : 'config.h', configuration : config_h)\n> > \n> > diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\n> > index 26912ca1..d6a78760 100644\n> > --- a/src/libcamera/meson.build\n> > +++ b/src/libcamera/meson.build\n> > @@ -98,11 +98,11 @@ endforeach\n> > \n> > libcamera_sources += control_sources\n> > \n> > -gen_version = meson.source_root() / 'utils' / 'gen-version.sh'\n> > +gen_version = meson.project_source_root() / 'utils' / 'gen-version.sh'\n> > \n> > # Use vcs_tag() and not configure_file() or run_command(), to ensure that the\n> > # version gets updated with every ninja build and not just at meson setup time.\n> > -version_cpp = vcs_tag(command : [gen_version, meson.build_root(), meson.source_root()],\n> > +version_cpp = vcs_tag(command : [gen_version, meson.project_build_root(), meson.project_source_root()],\n> > input : 'version.cpp.in',\n> > output : 'version.cpp',\n> > fallback : meson.project_version())\n> > diff --git a/test/serialization/generated_serializer/include/libcamera/ipa/meson.build b/test/serialization/generated_serializer/include/libcamera/ipa/meson.build\n> > index ba198f7a..6f8794c1 100644\n> > --- a/test/serialization/generated_serializer/include/libcamera/ipa/meson.build\n> > +++ b/test/serialization/generated_serializer/include/libcamera/ipa/meson.build\n> > @@ -6,8 +6,8 @@ mojom = custom_target('test_mojom_module',\n> > output : 'test.mojom-module',\n> > command : [\n> > mojom_parser,\n> > - '--output-root', meson.build_root(),\n> > - '--input-root', meson.source_root(),\n> > + '--output-root', meson.project_build_root(),\n> > + '--input-root', meson.project_source_root(),\n> > '--mojoms', '@INPUT@'\n> > ])\n> > \n> > -- \n> > 2.34.1\n> >","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 D413CC0F2A\n\tfor ;\n\tThu, 5 May 2022 15:51:45 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2FB9660424;\n\tThu, 5 May 2022 17:51:45 +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 E79E3603AB\n\tfor ;\n\tThu, 5 May 2022 17:51:42 +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 4B467492;\n\tThu, 5 May 2022 17:51:42 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1651765905;\n\tbh=ON+fozqZ/kPdrgkCFB7eCCIZ5PEUdxn3Ot4Wt6lJxac=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=YP9zk/pNjp1AoOtqsQCFKkDZp87P8yyTS+cG89N9StmI7uAbjf7XYUpMaj5pnekLX\n\tMoejGnC81j1SXq/TZeew8YkYEyKJ011EbIGjxn1sIswQy9oJ0L9o7Rnpn59NX3fTQ2\n\tsO0vrVqWu5n05nk5njhTbZhs9RRkoEFClZYkI+Rx+QyN1k2dEEPCRL6b2pzphPSWto\n\tNP3wlg6JWnIHcmf8QaqYPID98nBIrbdgRqxlC1PWXXpjXzHxA94OUN4LfJBj9Mrn6C\n\t7hPSHHnkW658BrNI4aMQVpo/J0nqY0N+jcfW7+ialkE0cE+Bp0vAh4rN4FNwK7hbRX\n\tgzoCEFivN/i9g==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1651765902;\n\tbh=ON+fozqZ/kPdrgkCFB7eCCIZ5PEUdxn3Ot4Wt6lJxac=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=R99OGFiBPtIbuXi92+9Clypn8/F1pLr9vxj+HoDw6AUEFfWZLQlekMcaom/f4l9Rt\n\t9An19O4tzl3UlwCgZaK2jDYZD58kp/voBQR2BcgCXkY19UFMepfG8P6ElTDSHba86x\n\tJV91htRugsFgOrb2AK8fHBV/cHXWSMGIz0I0ccAM="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"R99OGFiB\"; dkim-atps=neutral","Date":"Thu, 5 May 2022 18:51:38 +0300","To":"Kieran Bingham ","Message-ID":"","References":"<20220505104104.70841-1-tomi.valkeinen@ideasonboard.com>\n\t<20220505104104.70841-3-tomi.valkeinen@ideasonboard.com>\n\t<165175386222.1217485.8480556512248851092@Monstersaurus>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<165175386222.1217485.8480556512248851092@Monstersaurus>","Subject":"Re: [libcamera-devel] [PATCH v7 02/13] meson: use new\n\tproject_*_root() functions","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","From":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]