{"id":15785,"url":"https://patchwork.libcamera.org/api/1.1/patches/15785/?format=json","web_url":"https://patchwork.libcamera.org/patch/15785/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20220505104104.70841-3-tomi.valkeinen@ideasonboard.com>","date":"2022-05-05T10:40:53","name":"[libcamera-devel,v7,02/13] meson: use new project_*_root() functions","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"d4e3273931f335d8baff7f374fe2d57c2319f9af","submitter":{"id":109,"url":"https://patchwork.libcamera.org/api/1.1/people/109/?format=json","name":"Tomi Valkeinen","email":"tomi.valkeinen@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15785/mbox/","series":[{"id":3093,"url":"https://patchwork.libcamera.org/api/1.1/series/3093/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3093","date":"2022-05-05T10:40:51","name":"Python bindings","version":7,"mbox":"https://patchwork.libcamera.org/series/3093/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15785/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15785/checks/","tags":{},"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 4AACEC0F2A\n\tfor ;\n\tThu, 5 May 2022 10:41:32 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2F82E65655;\n\tThu, 5 May 2022 12:41:29 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4F9006563F\n\tfor ;\n\tThu, 5 May 2022 12:41:26 +0200 (CEST)","from deskari.lan (91-156-85-209.elisa-laajakaista.fi\n\t[91.156.85.209])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id BA587A43;\n\tThu, 5 May 2022 12:41:25 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1651747289;\n\tbh=DArP7Vx06OZE0ST1EUrPmhhvKGvmluGFhh49JBJ7RO4=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=PZdEwL7VeBOafFWwy3RsF1Y42EMVOPp3qJEUwV6gsb6FdX8oGQWtlQbD/f2v3GZGU\n\tANP6INBiorrvF9wjKRMIxC595X94Pfwp6XCa8E7EMjBhkeYaKzhCM9VFtljgnUGCEA\n\tNva/ta+rtIMKCGyEt9xMIypgIlkFYECk5RfEvGw6CQLHWDuCsAaFdTFHIRhkLn+cs9\n\tPbJbou3WbJ+oILkHpfD55GMMgfRHXxtUGRyftX7He8eYV9nH+8D64+KMbtxWokPkUz\n\tOZSAxbi34MTmd+1PHAvbFnf7rIFPw6WUDtQanUE4FWs9LfqT0Mst6VNvlBRoohExWQ\n\tEsemUNLffO16w==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1651747286;\n\tbh=DArP7Vx06OZE0ST1EUrPmhhvKGvmluGFhh49JBJ7RO4=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Sj7O317BUg1/oUfjK1u3jg0lKqwRZYdsY+4K+HjwqCUK5hr6qwvJlPFlYbDaNPpm8\n\t7jwPpxBr+ot7DYzP3M25a7E8q+0nyKv1nNHyFurZmPtsEpO7BXZ3AusHolIDv29xFn\n\tCHEVi8sV8Tym1D6ak6fJYCo3QUEbJubDvreljjCc="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"Sj7O317B\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org,\n\tDavid Plowman ,\n\tKieran Bingham ,\n\tLaurent Pinchart ,\n\tJacopo Mondi ","Date":"Thu, 5 May 2022 13:40:53 +0300","Message-Id":"<20220505104104.70841-3-tomi.valkeinen@ideasonboard.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20220505104104.70841-1-tomi.valkeinen@ideasonboard.com>","References":"<20220505104104.70841-1-tomi.valkeinen@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v7 02/13] meson: use new project_*_root()\n\tfunctions","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":"Tomi Valkeinen via libcamera-devel\n\t","Reply-To":"Tomi Valkeinen ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"meson.source_root() and meson.build_root() are deprecated. Use\nmeson.project_source_root() and meson.project_build_root() instead.\n\nSigned-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(-)","diff":"diff --git a/Documentation/meson.build b/Documentation/meson.build\nindex 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',\ndiff --git a/include/libcamera/ipa/meson.build b/include/libcamera/ipa/meson.build\nindex 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 \ndiff --git a/meson.build b/meson.build\nindex 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 \ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex 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())\ndiff --git a/test/serialization/generated_serializer/include/libcamera/ipa/meson.build b/test/serialization/generated_serializer/include/libcamera/ipa/meson.build\nindex 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","prefixes":["libcamera-devel","v7","02/13"]}