From patchwork Thu May 5 10:40:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 15785 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 4AACEC0F2A for ; Thu, 5 May 2022 10:41:32 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 2F82E65655; Thu, 5 May 2022 12:41:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1651747289; bh=DArP7Vx06OZE0ST1EUrPmhhvKGvmluGFhh49JBJ7RO4=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=PZdEwL7VeBOafFWwy3RsF1Y42EMVOPp3qJEUwV6gsb6FdX8oGQWtlQbD/f2v3GZGU ANP6INBiorrvF9wjKRMIxC595X94Pfwp6XCa8E7EMjBhkeYaKzhCM9VFtljgnUGCEA Nva/ta+rtIMKCGyEt9xMIypgIlkFYECk5RfEvGw6CQLHWDuCsAaFdTFHIRhkLn+cs9 PbJbou3WbJ+oILkHpfD55GMMgfRHXxtUGRyftX7He8eYV9nH+8D64+KMbtxWokPkUz OZSAxbi34MTmd+1PHAvbFnf7rIFPw6WUDtQanUE4FWs9LfqT0Mst6VNvlBRoohExWQ EsemUNLffO16w== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4F9006563F for ; Thu, 5 May 2022 12:41:26 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Sj7O317B"; dkim-atps=neutral Received: from deskari.lan (91-156-85-209.elisa-laajakaista.fi [91.156.85.209]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id BA587A43; Thu, 5 May 2022 12:41:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1651747286; bh=DArP7Vx06OZE0ST1EUrPmhhvKGvmluGFhh49JBJ7RO4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Sj7O317BUg1/oUfjK1u3jg0lKqwRZYdsY+4K+HjwqCUK5hr6qwvJlPFlYbDaNPpm8 7jwPpxBr+ot7DYzP3M25a7E8q+0nyKv1nNHyFurZmPtsEpO7BXZ3AusHolIDv29xFn CHEVi8sV8Tym1D6ak6fJYCo3QUEbJubDvreljjCc= To: libcamera-devel@lists.libcamera.org, David Plowman , Kieran Bingham , Laurent Pinchart , Jacopo 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 Subject: [libcamera-devel] [PATCH v7 02/13] meson: use new project_*_root() functions X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tomi Valkeinen via libcamera-devel From: Tomi Valkeinen Reply-To: Tomi Valkeinen Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" meson.source_root() and meson.build_root() are deprecated. Use meson.project_source_root() and meson.project_build_root() instead. Signed-off-by: Tomi Valkeinen Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- Documentation/meson.build | 4 ++-- include/libcamera/ipa/meson.build | 8 ++++---- meson.build | 6 +++--- src/libcamera/meson.build | 4 ++-- .../include/libcamera/ipa/meson.build | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Documentation/meson.build b/Documentation/meson.build index 33af82aa..8e2eacc6 100644 --- a/Documentation/meson.build +++ b/Documentation/meson.build @@ -12,8 +12,8 @@ dot = find_program('dot', required : get_option('documentation')) if doxygen.found() and dot.found() cdata = configuration_data() cdata.set('VERSION', 'v@0@'.format(libcamera_git_version)) - cdata.set('TOP_SRCDIR', meson.source_root()) - cdata.set('TOP_BUILDDIR', meson.build_root()) + cdata.set('TOP_SRCDIR', meson.project_source_root()) + cdata.set('TOP_BUILDDIR', meson.project_build_root()) doxyfile = configure_file(input : 'Doxyfile.in', output : 'Doxyfile', diff --git a/include/libcamera/ipa/meson.build b/include/libcamera/ipa/meson.build index 6ea94fb5..442ca3dd 100644 --- a/include/libcamera/ipa/meson.build +++ b/include/libcamera/ipa/meson.build @@ -25,8 +25,8 @@ ipa_mojom_core = custom_target(core_mojom_file.split('.')[0] + '_mojom_module', output : core_mojom_file + '-module', command : [ mojom_parser, - '--output-root', meson.build_root(), - '--input-root', meson.source_root(), + '--output-root', meson.project_build_root(), + '--input-root', meson.project_source_root(), '--mojoms', '@INPUT@' ]) @@ -89,8 +89,8 @@ foreach file : ipa_mojom_files depends : ipa_mojom_core, command : [ mojom_parser, - '--output-root', meson.build_root(), - '--input-root', meson.source_root(), + '--output-root', meson.project_build_root(), + '--input-root', meson.project_source_root(), '--mojoms', '@INPUT@' ]) diff --git a/meson.build b/meson.build index b892ba84..10ad8c5c 100644 --- a/meson.build +++ b/meson.build @@ -17,8 +17,8 @@ project('libcamera', 'c', 'cpp', # git version tag, the build metadata (e.g. +211-c94a24f4) is omitted from # libcamera_git_version. libcamera_git_version = run_command('utils/gen-version.sh', - meson.build_root(), - meson.source_root()).stdout().strip() + meson.project_build_root(), + meson.project_source_root()).stdout().strip() if libcamera_git_version == '' libcamera_git_version = meson.project_version() endif @@ -160,7 +160,7 @@ endif # Create a symlink from the build root to the source root. This is used when # running libcamera from the build directory to locate resources in the source # directory (such as IPA configuration files). -run_command('ln', '-fsT', meson.source_root(), meson.build_root() / 'source') +run_command('ln', '-fsT', meson.project_source_root(), meson.project_build_root() / 'source') configure_file(output : 'config.h', configuration : config_h) diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 26912ca1..d6a78760 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -98,11 +98,11 @@ endforeach libcamera_sources += control_sources -gen_version = meson.source_root() / 'utils' / 'gen-version.sh' +gen_version = meson.project_source_root() / 'utils' / 'gen-version.sh' # Use vcs_tag() and not configure_file() or run_command(), to ensure that the # version gets updated with every ninja build and not just at meson setup time. -version_cpp = vcs_tag(command : [gen_version, meson.build_root(), meson.source_root()], +version_cpp = vcs_tag(command : [gen_version, meson.project_build_root(), meson.project_source_root()], input : 'version.cpp.in', output : 'version.cpp', fallback : meson.project_version()) diff --git a/test/serialization/generated_serializer/include/libcamera/ipa/meson.build b/test/serialization/generated_serializer/include/libcamera/ipa/meson.build index ba198f7a..6f8794c1 100644 --- a/test/serialization/generated_serializer/include/libcamera/ipa/meson.build +++ b/test/serialization/generated_serializer/include/libcamera/ipa/meson.build @@ -6,8 +6,8 @@ mojom = custom_target('test_mojom_module', output : 'test.mojom-module', command : [ mojom_parser, - '--output-root', meson.build_root(), - '--input-root', meson.source_root(), + '--output-root', meson.project_build_root(), + '--input-root', meson.project_source_root(), '--mojoms', '@INPUT@' ])