From nobody Thu May 2 04:17:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1665139504; cv=none; d=zohomail.com; s=zohoarc; b=K3qSDCEv4hHaJbhh9rU5dWuhU4uyBcoUhkrlZG+lPb+NubNhBh8KXnhiFgQFBOKyHqlhKxfL4xmen/zdCv23Id5YQigVZWER9Qi5HcY002hk10njPrnYaBymrDRfsw2Ozk5+ysdtYs3YjRxUkc6qEDL9TgpZyRKVo7OmUrjM6bU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1665139504; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Eu4ie7IxRL6qkM2Qycl6I4uaWRFu4l6LugqP4KvTO7k=; b=JZwu/x3q6qAhRsIWZFGt9hN5IHdAVTzKu5SXBnvWynXa3k0l0HEwucP6IdeqthpLBI6VgR/Emw1zGKE232+tmfRMhP9n0j3XtcX+oKngEJrPTxIjUTdsOS+QERi82NI59al73z3EZN4YaTi7IPWV3MSjoLbK3G4h+HTcmZn/5UE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1665139504118794.2118258891572; Fri, 7 Oct 2022 03:45:04 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-613-SWEzrqaiOiGdz0d23jxpkA-1; Fri, 07 Oct 2022 06:44:43 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 791EE858282; Fri, 7 Oct 2022 10:44:40 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 60591111CA05; Fri, 7 Oct 2022 10:44:40 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D191A1946A52; Fri, 7 Oct 2022 10:44:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 665561946A49 for ; Fri, 7 Oct 2022 10:44:38 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4A71D728FC; Fri, 7 Oct 2022 10:44:38 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id E103617582 for ; Fri, 7 Oct 2022 10:44:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665139503; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Eu4ie7IxRL6qkM2Qycl6I4uaWRFu4l6LugqP4KvTO7k=; b=JRKupb/VN8I9Sqgt6dzdeKNDcCDvA5ETz0wzoTZlle9gjQYmlRbjmpRa647v5Tf72GKWIq fUDB7Vpn0O+1lVXA8QtuFITPApg2KFvNbz6v1Ws88SiHGmiKEouXhLsh5+OfHypREt92Ow 1qCrXwiCbnrlDgJfiwyyN7LPfwo1lls= X-MC-Unique: SWEzrqaiOiGdz0d23jxpkA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 1/5] meson: Replace meson.build_root() with meson.project_build_root() Date: Fri, 7 Oct 2022 12:44:21 +0200 Message-Id: <8e4a17b845a2e36c166dc094a377c89691e89727.1665139419.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1665139506339100002 Content-Type: text/plain; charset="utf-8"; x-default="true" The build_root() method is deprecated in 0.56.0 and we're recommended to use project_build_root() instead. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- build-aux/meson.build | 2 +- docs/go/meson.build | 2 +- docs/html/meson.build | 4 ++-- docs/kbase/internals/meson.build | 2 +- docs/kbase/meson.build | 2 +- docs/manpages/meson.build | 2 +- docs/meson.build | 6 +++--- meson.build | 8 ++++---- po/meson.build | 2 +- src/esx/meson.build | 4 ++-- src/hyperv/meson.build | 2 +- src/meson.build | 4 ++-- tests/meson.build | 4 ++-- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/build-aux/meson.build b/build-aux/meson.build index fcd231a386..6017f07c0a 100644 --- a/build-aux/meson.build +++ b/build-aux/meson.build @@ -30,7 +30,7 @@ awk_prog =3D find_program('awk') =20 syntax_check_conf =3D configuration_data({ 'top_srcdir': meson.source_root(), - 'top_builddir': meson.build_root(), + 'top_builddir': meson.project_build_root(), 'flake8_path': flake8_path, 'runutf8': ' '.join(runutf8), 'PYTHON3': python3_prog.path(), diff --git a/docs/go/meson.build b/docs/go/meson.build index c0e19c4182..29467c61f0 100644 --- a/docs/go/meson.build +++ b/docs/go/meson.build @@ -31,7 +31,7 @@ foreach data : html_xslt_gen command: [ xsltproc_prog, '--stringparam', 'pagesrc', data.get('source', ''), - '--stringparam', 'builddir', meson.build_root(), + '--stringparam', 'builddir', meson.project_build_root(), '--stringparam', 'timestamp', docs_timestamp, '--stringparam', 'href_base', data.get('href_base', ''), '--nonet', diff --git a/docs/html/meson.build b/docs/html/meson.build index e194b5942c..b0ca400d08 100644 --- a/docs/html/meson.build +++ b/docs/html/meson.build @@ -39,7 +39,7 @@ index_api_gen =3D custom_target( ], command: [ xsltproc_prog, '--nonet', '-o', docs_builddir, - '--stringparam', 'builddir', meson.build_root(), + '--stringparam', 'builddir', meson.project_build_root(), '--stringparam', 'timestamp', docs_timestamp, '@INPUT@', ], @@ -66,7 +66,7 @@ foreach name : [ 'admin', 'lxc', 'qemu' ] ], command: [ xsltproc_prog, '--nonet', '-o', docs_builddir, - '--stringparam', 'builddir', meson.build_root(), + '--stringparam', 'builddir', meson.project_build_root(), '--stringparam', 'timestamp', docs_timestamp, '--stringparam', 'indexfile', 'index-@0@.html'.format(name), '@INPUT@', diff --git a/docs/kbase/internals/meson.build b/docs/kbase/internals/meson.= build index a16d5a290b..f1e9122f8f 100644 --- a/docs/kbase/internals/meson.build +++ b/docs/kbase/internals/meson.build @@ -40,7 +40,7 @@ foreach data : html_xslt_gen command: [ xsltproc_prog, '--stringparam', 'pagesrc', data.get('source', ''), - '--stringparam', 'builddir', meson.build_root(), + '--stringparam', 'builddir', meson.project_build_root(), '--stringparam', 'timestamp', docs_timestamp, '--stringparam', 'href_base', data.get('href_base', ''), '--nonet', diff --git a/docs/kbase/meson.build b/docs/kbase/meson.build index c7eae3738f..5b608293e2 100644 --- a/docs/kbase/meson.build +++ b/docs/kbase/meson.build @@ -50,7 +50,7 @@ foreach data : html_xslt_gen command: [ xsltproc_prog, '--stringparam', 'pagesrc', data.get('source', ''), - '--stringparam', 'builddir', meson.build_root(), + '--stringparam', 'builddir', meson.project_build_root(), '--stringparam', 'timestamp', docs_timestamp, '--stringparam', 'href_base', data.get('href_base', ''), '--nonet', diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build index ba673cf472..0a5a8a32d4 100644 --- a/docs/manpages/meson.build +++ b/docs/manpages/meson.build @@ -147,7 +147,7 @@ foreach data : html_xslt_gen command: [ xsltproc_prog, '--stringparam', 'pagesrc', data.get('source', ''), - '--stringparam', 'builddir', meson.build_root(), + '--stringparam', 'builddir', meson.project_build_root(), '--stringparam', 'timestamp', docs_timestamp, '--stringparam', 'href_base', data.get('href_base', ''), '--nonet', diff --git a/docs/meson.build b/docs/meson.build index 39c60f9034..2b292b1a5a 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -264,7 +264,7 @@ hvsupport_html_in =3D custom_target( python3_prog, hvsupport_prog, meson.source_root(), - meson.build_root(), + meson.project_build_root(), ], capture: true, depend_files: [ @@ -305,7 +305,7 @@ foreach data : html_xslt_gen command: [ xsltproc_prog, '--stringparam', 'pagesrc', data.get('source', ''), - '--stringparam', 'builddir', meson.build_root(), + '--stringparam', 'builddir', meson.project_build_root(), '--stringparam', 'timestamp', docs_timestamp, '--stringparam', 'href_base', data.get('href_base', ''), '--nonet', @@ -360,7 +360,7 @@ test( args: [ check_html_references_prog.path(), '--prefix', - meson.build_root() / 'docs' + meson.project_build_root() / 'docs' ], env: runutf8, ) diff --git a/meson.build b/meson.build index 0f4650f467..b7a0e4726f 100644 --- a/meson.build +++ b/meson.build @@ -26,7 +26,7 @@ endif conf =3D configuration_data() =20 conf.set('_GNU_SOURCE', 1) -conf.set_quoted('abs_top_builddir', meson.build_root()) +conf.set_quoted('abs_top_builddir', meson.project_build_root()) conf.set_quoted('abs_top_srcdir', meson.source_root()) conf.set_quoted('PACKAGE', meson.project_name()) conf.set_quoted('PACKAGE_NAME', meson.project_name()) @@ -2171,7 +2171,7 @@ if git foreach file : dist_files meson.add_dist_script( meson_python_prog.path(), python3_prog.path(), meson_dist_prog.path(= ), - meson.build_root(), file + meson.project_build_root(), file ) endforeach endif @@ -2183,8 +2183,8 @@ configure_file(output: 'meson-config.h', configuratio= n: conf) =20 # generate run helper run_conf =3D configuration_data({ - 'abs_builddir': meson.build_root(), - 'abs_top_builddir': meson.build_root(), + 'abs_builddir': meson.project_build_root(), + 'abs_top_builddir': meson.project_build_root(), }) =20 configure_file( diff --git a/po/meson.build b/po/meson.build index f5d05e2b31..0f2a1bb617 100644 --- a/po/meson.build +++ b/po/meson.build @@ -8,7 +8,7 @@ i18n.gettext( '--keyword=3DN_', '--add-comments=3DTRANSLATORS:', '--directory=3D@0@'.format(meson.source_root()), - '--directory=3D@0@'.format(meson.build_root()), + '--directory=3D@0@'.format(meson.project_build_root()), '--files-from=3D@0@'.format(meson.current_source_dir() / 'POTFILES'), '--msgid-bugs-address=3Dhttps://libvirt.org/bugs.html', '--package-version=3D@0@'.format(meson.project_version()), diff --git a/src/esx/meson.build b/src/esx/meson.build index 5861e90afa..2d05294ba1 100644 --- a/src/esx/meson.build +++ b/src/esx/meson.build @@ -27,7 +27,7 @@ esx_gen_headers =3D custom_target( command: [ meson_python_prog, python3_prog, esx_vi_generator_prog, meson.source_root() / 'src', - meson.build_root() / 'src', + meson.project_build_root() / 'src', 'header', ], ) @@ -48,7 +48,7 @@ esx_gen_sources =3D custom_target( command: [ meson_python_prog, python3_prog, esx_vi_generator_prog, meson.source_root() / 'src', - meson.build_root() / 'src', + meson.project_build_root() / 'src', 'source', ], ) diff --git a/src/hyperv/meson.build b/src/hyperv/meson.build index 0f0cdb9e54..2589fc5437 100644 --- a/src/hyperv/meson.build +++ b/src/hyperv/meson.build @@ -19,7 +19,7 @@ hyperv_gen_sources =3D custom_target( command: [ meson_python_prog, python3_prog, hyperv_wmi_generator_prog, meson.source_root() / 'src', - meson.build_root() / 'src', + meson.project_build_root() / 'src', ], ) =20 diff --git a/src/meson.build b/src/meson.build index 88a6f15760..8000796733 100644 --- a/src/meson.build +++ b/src/meson.build @@ -3,7 +3,7 @@ src_inc_dir =3D include_directories('.') src_dep =3D declare_dependency( compile_args: [ '-DIN_LIBVIRT', - '-Dabs_top_builddir=3D"@0@"'.format(meson.build_root()), + '-Dabs_top_builddir=3D"@0@"'.format(meson.project_build_root()), '-Dabs_top_srcdir=3D"@0@"'.format(meson.source_root()), ] + coverage_flags + win32_flags, dependencies: [ @@ -1032,7 +1032,7 @@ run_pkg_config_files =3D [ =20 run_pkg_config_conf =3D configuration_data({ 'VERSION': meson.project_version(), - 'abs_top_builddir': meson.build_root(), + 'abs_top_builddir': meson.project_build_root(), 'abs_top_srcdir': meson.source_root(), }) =20 diff --git a/tests/meson.build b/tests/meson.build index 2556b71444..3819eb8ba9 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1,7 +1,7 @@ tests_dep =3D declare_dependency( compile_args: [ '-Dabs_builddir=3D"@0@"'.format(meson.current_build_dir()), - '-Dabs_top_builddir=3D"@0@"'.format(meson.build_root()), + '-Dabs_top_builddir=3D"@0@"'.format(meson.project_build_root()), '-Dabs_srcdir=3D"@0@"'.format(meson.current_source_dir()), '-Dabs_top_srcdir=3D"@0@"'.format(meson.source_root()), ] + coverage_flags + cc_flags_relaxed_frame_limit, @@ -36,7 +36,7 @@ tests_dep =3D declare_dependency( tests_env =3D [ 'abs_builddir=3D@0@'.format(meson.current_build_dir()), 'abs_srcdir=3D@0@'.format(meson.current_source_dir()), - 'abs_top_builddir=3D@0@'.format(meson.build_root()), + 'abs_top_builddir=3D@0@'.format(meson.project_build_root()), 'abs_top_srcdir=3D@0@'.format(meson.source_root()), 'LC_ALL=3DC', 'LIBVIRT_AUTOSTART=3D0', --=20 2.35.1 From nobody Thu May 2 04:17:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1665139488; cv=none; d=zohomail.com; s=zohoarc; b=mwCWepQRAamioRjw744ZXI9aVZKPtRw4uz70dBlZmlXO7EZH/jzzHg44Ivim/j8DcCQICP7KO9vYGd3qJxW2dtwQciCeNy7aPjDgmvsd9LLSojrnzoeq9tyIuNNSKFNaifzo/IXJJzlIH5BBtO5DwLQSFIymN1QVEH9zQw5p71I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1665139488; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gDAB/dbSV1YpI1ibsL9XVGhhRyPG1ymTXepBtpQQyns=; b=dzVq4sKo4jTd3Qu3qWpJ0keEziKxBK1MFolfXq7zMcQySk5e1W1PM+OyC6BXCIIGzl8k20FudiHKO9F1DbJkao82aM1zieY/19+Z1sdRuKDFlE/tK3/x/LwXHqub9DpYp/vPyUwM4tpjYT2jiwzJcofk/YUtKlXTxIY6mTugZAI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1665139488143208.92730473389474; Fri, 7 Oct 2022 03:44:48 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-75-6-xSkO0gPiedECQhTtWuQA-1; Fri, 07 Oct 2022 06:44:43 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CDF5D95E3B6; Fri, 7 Oct 2022 10:44:40 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B842A2022EA2; Fri, 7 Oct 2022 10:44:40 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1E0D21946A75; Fri, 7 Oct 2022 10:44:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 03DA81946A75 for ; Fri, 7 Oct 2022 10:44:39 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DC8B49D49F; Fri, 7 Oct 2022 10:44:38 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F2C317582 for ; Fri, 7 Oct 2022 10:44:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665139487; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=gDAB/dbSV1YpI1ibsL9XVGhhRyPG1ymTXepBtpQQyns=; b=QRUtb+iHcq4eiBTvjYuhkieE+HPcDv/nLQX2t0ZabYRT0TtUy/omJ2y5XmnQTioWrfdSIX C5pEAs5vo3LHhqMCkOsq4N9QpWwyvSkfYtHZrfbNTDbm5ZIcvHzUEchLB+7Tf981odUoHO VUgkrfYouDGX1qfUHZpszJehs013Y4E= X-MC-Unique: 6-xSkO0gPiedECQhTtWuQA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 2/5] meson: Replace meson.source_root() with meson.project_source_root() Date: Fri, 7 Oct 2022 12:44:22 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1665139490245100004 Content-Type: text/plain; charset="utf-8"; x-default="true" The source_root() method is deprecated in 0.56.0 and we're recommended to use project_source_root() instead. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- build-aux/meson.build | 2 +- docs/meson.build | 4 ++-- meson.build | 4 ++-- po/meson.build | 2 +- src/access/meson.build | 2 +- src/esx/meson.build | 4 ++-- src/hyperv/meson.build | 2 +- src/meson.build | 4 ++-- src/util/meson.build | 4 ++-- tests/meson.build | 4 ++-- tools/wireshark/src/libvirt/meson.build | 8 ++++---- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/build-aux/meson.build b/build-aux/meson.build index 6017f07c0a..1c6b7fab53 100644 --- a/build-aux/meson.build +++ b/build-aux/meson.build @@ -29,7 +29,7 @@ endif awk_prog =3D find_program('awk') =20 syntax_check_conf =3D configuration_data({ - 'top_srcdir': meson.source_root(), + 'top_srcdir': meson.project_source_root(), 'top_builddir': meson.project_build_root(), 'flake8_path': flake8_path, 'runutf8': ' '.join(runutf8), diff --git a/docs/meson.build b/docs/meson.build index 2b292b1a5a..d88879fd2f 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -263,7 +263,7 @@ hvsupport_html_in =3D custom_target( meson_python_prog, python3_prog, hvsupport_prog, - meson.source_root(), + meson.project_source_root(), meson.project_build_root(), ], capture: true, @@ -282,7 +282,7 @@ html_xslt_gen +=3D { 'file': hvsupport_html_in, } =20 -news_html_in =3D docs_rst2html5_gen.process(meson.source_root() / 'NEWS.rs= t') +news_html_in =3D docs_rst2html5_gen.process(meson.project_source_root() / = 'NEWS.rst') html_xslt_gen +=3D { 'name': 'news', 'file': news_html_in, diff --git a/meson.build b/meson.build index b7a0e4726f..92f22d3538 100644 --- a/meson.build +++ b/meson.build @@ -27,7 +27,7 @@ conf =3D configuration_data() =20 conf.set('_GNU_SOURCE', 1) conf.set_quoted('abs_top_builddir', meson.project_build_root()) -conf.set_quoted('abs_top_srcdir', meson.source_root()) +conf.set_quoted('abs_top_srcdir', meson.project_source_root()) conf.set_quoted('PACKAGE', meson.project_name()) conf.set_quoted('PACKAGE_NAME', meson.project_name()) conf.set_quoted('PACKAGE_VERSION', meson.project_version()) @@ -514,7 +514,7 @@ elif host_machine.system() =3D=3D 'darwin' # macOS libraries don't support symbol versioning version_script_flags =3D '' else - test_file =3D '@0@/src/libvirt_qemu.syms'.format(meson.source_root()) + test_file =3D '@0@/src/libvirt_qemu.syms'.format(meson.project_source_ro= ot()) if cc.has_link_argument('-Wl,--version-script=3D@0@'.format(test_file)) version_script_flags =3D '-Wl,--version-script=3D' else diff --git a/po/meson.build b/po/meson.build index 0f2a1bb617..fbfdc2d08d 100644 --- a/po/meson.build +++ b/po/meson.build @@ -7,7 +7,7 @@ i18n.gettext( '--keyword=3D_', '--keyword=3DN_', '--add-comments=3DTRANSLATORS:', - '--directory=3D@0@'.format(meson.source_root()), + '--directory=3D@0@'.format(meson.project_source_root()), '--directory=3D@0@'.format(meson.project_build_root()), '--files-from=3D@0@'.format(meson.current_source_dir() / 'POTFILES'), '--msgid-bugs-address=3Dhttps://libvirt.org/bugs.html', diff --git a/src/access/meson.build b/src/access/meson.build index 36aff6fd88..4d563a1a60 100644 --- a/src/access/meson.build +++ b/src/access/meson.build @@ -11,7 +11,7 @@ access_polkit_sources =3D [ =20 access_perm_h =3D files('viraccessperm.h') =20 -remote_path =3D meson.source_root() / 'src' / 'remote' +remote_path =3D meson.project_source_root() / 'src' / 'remote' =20 access_gen_headers =3D [] access_gen_sources =3D [] diff --git a/src/esx/meson.build b/src/esx/meson.build index 2d05294ba1..d1f42fdcc4 100644 --- a/src/esx/meson.build +++ b/src/esx/meson.build @@ -26,7 +26,7 @@ esx_gen_headers =3D custom_target( ], command: [ meson_python_prog, python3_prog, esx_vi_generator_prog, - meson.source_root() / 'src', + meson.project_source_root() / 'src', meson.project_build_root() / 'src', 'header', ], @@ -47,7 +47,7 @@ esx_gen_sources =3D custom_target( ], command: [ meson_python_prog, python3_prog, esx_vi_generator_prog, - meson.source_root() / 'src', + meson.project_source_root() / 'src', meson.project_build_root() / 'src', 'source', ], diff --git a/src/hyperv/meson.build b/src/hyperv/meson.build index 2589fc5437..3509ce12f7 100644 --- a/src/hyperv/meson.build +++ b/src/hyperv/meson.build @@ -18,7 +18,7 @@ hyperv_gen_sources =3D custom_target( ], command: [ meson_python_prog, python3_prog, hyperv_wmi_generator_prog, - meson.source_root() / 'src', + meson.project_source_root() / 'src', meson.project_build_root() / 'src', ], ) diff --git a/src/meson.build b/src/meson.build index 8000796733..916bf1c863 100644 --- a/src/meson.build +++ b/src/meson.build @@ -4,7 +4,7 @@ src_dep =3D declare_dependency( compile_args: [ '-DIN_LIBVIRT', '-Dabs_top_builddir=3D"@0@"'.format(meson.project_build_root()), - '-Dabs_top_srcdir=3D"@0@"'.format(meson.source_root()), + '-Dabs_top_srcdir=3D"@0@"'.format(meson.project_source_root()), ] + coverage_flags + win32_flags, dependencies: [ glib_dep, @@ -1033,7 +1033,7 @@ run_pkg_config_files =3D [ run_pkg_config_conf =3D configuration_data({ 'VERSION': meson.project_version(), 'abs_top_builddir': meson.project_build_root(), - 'abs_top_srcdir': meson.source_root(), + 'abs_top_srcdir': meson.project_source_root(), }) =20 foreach file : run_pkg_config_files diff --git a/src/util/meson.build b/src/util/meson.build index 07ae94631c..c81500ea04 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -137,8 +137,8 @@ keyname_list =3D [ 'win32', ] =20 -keymap_gen_prog =3D find_program('@0@/src/keycodemapdb/tools/keymap-gen'.f= ormat(meson.source_root())) -keymap_src_file =3D '@0@/src/keycodemapdb/data/keymaps.csv'.format(meson.s= ource_root()) +keymap_gen_prog =3D find_program('@0@/src/keycodemapdb/tools/keymap-gen'.f= ormat(meson.project_source_root())) +keymap_src_file =3D '@0@/src/keycodemapdb/data/keymaps.csv'.format(meson.p= roject_source_root()) =20 foreach name : keycode_list keycode_gen_sources +=3D custom_target( diff --git a/tests/meson.build b/tests/meson.build index 3819eb8ba9..967a01fe14 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -3,7 +3,7 @@ tests_dep =3D declare_dependency( '-Dabs_builddir=3D"@0@"'.format(meson.current_build_dir()), '-Dabs_top_builddir=3D"@0@"'.format(meson.project_build_root()), '-Dabs_srcdir=3D"@0@"'.format(meson.current_source_dir()), - '-Dabs_top_srcdir=3D"@0@"'.format(meson.source_root()), + '-Dabs_top_srcdir=3D"@0@"'.format(meson.project_source_root()), ] + coverage_flags + cc_flags_relaxed_frame_limit, dependencies: [ apparmor_dep, @@ -37,7 +37,7 @@ tests_env =3D [ 'abs_builddir=3D@0@'.format(meson.current_build_dir()), 'abs_srcdir=3D@0@'.format(meson.current_source_dir()), 'abs_top_builddir=3D@0@'.format(meson.project_build_root()), - 'abs_top_srcdir=3D@0@'.format(meson.source_root()), + 'abs_top_srcdir=3D@0@'.format(meson.project_source_root()), 'LC_ALL=3DC', 'LIBVIRT_AUTOSTART=3D0', ] diff --git a/tools/wireshark/src/libvirt/meson.build b/tools/wireshark/src/= libvirt/meson.build index 9d54f827d3..9c3b8aadc1 100644 --- a/tools/wireshark/src/libvirt/meson.build +++ b/tools/wireshark/src/libvirt/meson.build @@ -1,10 +1,10 @@ wireshark_protocol =3D custom_target( 'protocol.h', input: [ - meson.source_root() / 'src' / 'remote' / 'remote_protocol.x', - meson.source_root() / 'src' / 'remote' / 'qemu_protocol.x', - meson.source_root() / 'src' / 'remote' / 'lxc_protocol.x', - meson.source_root() / 'src' / 'rpc' / 'virkeepaliveprotocol.x', + meson.project_source_root() / 'src' / 'remote' / 'remote_protocol.x', + meson.project_source_root() / 'src' / 'remote' / 'qemu_protocol.x', + meson.project_source_root() / 'src' / 'remote' / 'lxc_protocol.x', + meson.project_source_root() / 'src' / 'rpc' / 'virkeepaliveprotocol.x', ], output: [ 'protocol.h', --=20 2.35.1 From nobody Thu May 2 04:17:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1665139489; cv=none; d=zohomail.com; s=zohoarc; b=SuHLrz6DhkGcdcFaOl4vkpAfgsGHvd/tyaCWgTsIO7vn582iI3Mi5R0IEgK2crhjj/sunDnW5BSdloqI5otfxJKcaeM0mXyz8i7n0T7nDt6ON/Nf+VmJ9f5Kx/fBqO3QXxX+5k9BLwj5d1WMUKUul3C1GLb/ihXthXwedtuh7OI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1665139489; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HPU9XH143wPdQJBv47pGlOBujaqXXYBEZxF7nFhLGdA=; b=MfaObDAU+PJTQ5pKBNNK5vWCWXnp0RyWUP/iOJV7vZPYmSaoUM1aoZOdRNXvNoACbiXfaPjcAHKu4Innp0RDtzz4DnTVJ5RtmX27eDMQJv9A+O+9S/26Ls4limtIhqHPcCl6XE+5zCexbHKvET5hQzOKSpZFgp/iFOE5S8rules= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1665139489947879.7682526353204; Fri, 7 Oct 2022 03:44:49 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-34-w0XaJ1NxN5yJXui-YVgm_g-1; Fri, 07 Oct 2022 06:44:45 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7B07295E3D2; Fri, 7 Oct 2022 10:44:42 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 68D2F2166B35; Fri, 7 Oct 2022 10:44:42 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id F2E711946A4E; Fri, 7 Oct 2022 10:44:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 95B7E1946A49 for ; Fri, 7 Oct 2022 10:44:39 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 78E569D49F; Fri, 7 Oct 2022 10:44:39 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E2BB728FC for ; Fri, 7 Oct 2022 10:44:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665139488; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=HPU9XH143wPdQJBv47pGlOBujaqXXYBEZxF7nFhLGdA=; b=BFx/rBcQcA02DdzcAv5YNYAgQdEy12l9lk768yX0/udRPSDz4k4REzxUPj8ncPCiZ7SYbE Y3nDajstZVZs5kjoQhoFqDCwcoRLFBz91Ighvp1dFMwsoJIT9Ftet0pconPBupQkRyOr9A m+PisC7WUtpHNxW8Ye1npqrwjm+zJSY= X-MC-Unique: w0XaJ1NxN5yJXui-YVgm_g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 3/5] meson: Replace external_program.path() with external_program.full_path() Date: Fri, 7 Oct 2022 12:44:23 +0200 Message-Id: <4829a645654fb4a6e67134a60b3e9836a2b22ed3.1665139419.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1665139490277100005 Content-Type: text/plain; charset="utf-8"; x-default="true" The path() method is deprecated in 0.55.0 and we're recommended to use full_path() instead. Interestingly, we were already doing do in couple of place, but not all of them. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- build-aux/meson.build | 10 +++++----- docs/meson.build | 8 ++++---- meson.build | 36 ++++++++++++++++++------------------ src/access/meson.build | 2 +- src/meson.build | 22 +++++++++++----------- src/network/meson.build | 2 +- tests/meson.build | 2 +- 7 files changed, 41 insertions(+), 41 deletions(-) diff --git a/build-aux/meson.build b/build-aux/meson.build index 1c6b7fab53..16d085505d 100644 --- a/build-aux/meson.build +++ b/build-aux/meson.build @@ -1,6 +1,6 @@ flake8_path =3D '' if flake8_prog.found() - flake8_path =3D flake8_prog.path() + flake8_path =3D flake8_prog.full_path() endif =20 if host_machine.system() =3D=3D 'freebsd' or host_machine.system() =3D=3D = 'darwin' @@ -33,10 +33,10 @@ syntax_check_conf =3D configuration_data({ 'top_builddir': meson.project_build_root(), 'flake8_path': flake8_path, 'runutf8': ' '.join(runutf8), - 'PYTHON3': python3_prog.path(), - 'GREP': grep_prog.path(), - 'SED': sed_prog.path(), - 'AWK': awk_prog.path(), + 'PYTHON3': python3_prog.full_path(), + 'GREP': grep_prog.full_path(), + 'SED': sed_prog.full_path(), + 'AWK': awk_prog.full_path(), }) =20 configure_file( diff --git a/docs/meson.build b/docs/meson.build index d88879fd2f..5c0c762db1 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -129,7 +129,7 @@ aclperms_gen =3D custom_target( ) =20 docs_timestamp =3D run_command( - python3_prog, meson_timestamp_prog.path(), env: runutf8, check: true, + python3_prog, meson_timestamp_prog.full_path(), env: runutf8, check: tru= e, ).stdout().strip() =20 site_xsl =3D files('site.xsl') @@ -175,7 +175,7 @@ docs_programs_groups =3D [ foreach item : docs_programs_groups prog =3D find_program(item.get('prog'), dirs: libvirt_sbin_path) varname =3D item.get('name').underscorify() - conf.set_quoted(varname.to_upper(), prog.path()) + conf.set_quoted(varname.to_upper(), prog.full_path()) set_variable('@0@_prog'.format(varname), prog) endforeach =20 @@ -348,7 +348,7 @@ endforeach run_target( 'install-web', command: [ - meson_python_prog, python3_prog.path(), meson_install_web_prog.path(), + meson_python_prog, python3_prog.full_path(), meson_install_web_prog.fu= ll_path(), install_web_files, ], depends: install_web_deps, @@ -358,7 +358,7 @@ test( 'check-html-references', python3_prog, args: [ - check_html_references_prog.path(), + check_html_references_prog.full_path(), '--prefix', meson.project_build_root() / 'docs' ], diff --git a/meson.build b/meson.build index 92f22d3538..822344e8a1 100644 --- a/meson.build +++ b/meson.build @@ -798,14 +798,14 @@ endif foreach name : required_programs prog =3D find_program(name, dirs: libvirt_sbin_path) varname =3D name.underscorify() - conf.set_quoted(varname.to_upper(), prog.path()) + conf.set_quoted(varname.to_upper(), prog.full_path()) set_variable('@0@_prog'.format(varname), prog) endforeach =20 foreach item : required_programs_groups prog =3D find_program(item.get('prog'), dirs: libvirt_sbin_path) varname =3D item.get('name').underscorify() - conf.set_quoted(varname.to_upper(), prog.path()) + conf.set_quoted(varname.to_upper(), prog.full_path()) set_variable('@0@_prog'.format(varname), prog) endforeach =20 @@ -835,7 +835,7 @@ foreach name : optional_programs prog =3D find_program(name, required: false, dirs: libvirt_sbin_path) varname =3D name.underscorify() if prog.found() - prog_path =3D prog.path() + prog_path =3D prog.full_path() else prog_path =3D name endif @@ -1446,9 +1446,9 @@ if not get_option('driver_bhyve').disabled() and host= _machine.system() =3D=3D 'freeb =20 if bhyve_prog.found() and bhyvectl_prog.found() and bhyveload_prog.found= () conf.set('WITH_BHYVE', 1) - conf.set_quoted('BHYVE', bhyve_prog.path()) - conf.set_quoted('BHYVECTL', bhyvectl_prog.path()) - conf.set_quoted('BHYVELOAD', bhyveload_prog.path()) + conf.set_quoted('BHYVE', bhyve_prog.full_path()) + conf.set_quoted('BHYVECTL', bhyvectl_prog.full_path()) + conf.set_quoted('BHYVELOAD', bhyveload_prog.full_path()) endif elif get_option('driver_bhyve').enabled() error('The bhyve driver cannot be enabled') @@ -1690,7 +1690,7 @@ if not get_option('driver_qemu').disabled() required: false ) if qemu_bridge_prog.found() - qemu_bridge_path =3D qemu_bridge_prog.path() + qemu_bridge_path =3D qemu_bridge_prog.full_path() else qemu_bridge_path =3D '/usr/libexec/qemu-bridge-helper' endif @@ -1702,7 +1702,7 @@ if not get_option('driver_qemu').disabled() required: false ) if qemu_pr_prog.found() - qemu_pr_path =3D qemu_pr_prog.path() + qemu_pr_path =3D qemu_pr_prog.full_path() else qemu_pr_path =3D '/usr/bin/qemu-pr-helper' endif @@ -1714,7 +1714,7 @@ if not get_option('driver_qemu').disabled() required: false ) if qemu_slirp_prog.found() - qemu_slirp_path =3D qemu_slirp_prog.path() + qemu_slirp_path =3D qemu_slirp_prog.full_path() else qemu_slirp_path =3D '/usr/bin/slirp-helper' endif @@ -1726,7 +1726,7 @@ if not get_option('driver_qemu').disabled() required: false ) if qemu_dbus_daemon_prog.found() - qemu_dbus_daemon_path =3D qemu_dbus_daemon_prog.path() + qemu_dbus_daemon_path =3D qemu_dbus_daemon_prog.full_path() else qemu_dbus_daemon_path =3D '/usr/bin/dbus-daemon' endif @@ -1822,14 +1822,14 @@ if conf.has('WITH_LIBVIRTD') use_storage =3D true =20 conf.set('WITH_STORAGE_FS', 1) - conf.set_quoted('MOUNT', mount_prog.path()) - conf.set_quoted('UMOUNT', umount_prog.path()) - conf.set_quoted('MKFS', mkfs_prog.path()) + conf.set_quoted('MOUNT', mount_prog.full_path()) + conf.set_quoted('UMOUNT', umount_prog.full_path()) + conf.set_quoted('MKFS', mkfs_prog.full_path()) =20 showmount_prog =3D find_program('showmount', required: false, dirs: = libvirt_sbin_path) showmount_path =3D '' if showmount_prog.found() - showmount_path =3D showmount_prog.path() + showmount_path =3D showmount_prog.full_path() endif conf.set_quoted('SHOWMOUNT', showmount_path) endif @@ -1879,7 +1879,7 @@ if conf.has('WITH_LIBVIRTD') conf.set('WITH_STORAGE_LVM', 1) =20 foreach name : lvm_progs - conf.set_quoted(name.to_upper(), get_variable('@0@_prog'.format(na= me)).path()) + conf.set_quoted(name.to_upper(), get_variable('@0@_prog'.format(na= me)).full_path()) endforeach endif endif @@ -2033,7 +2033,7 @@ if not get_option('numad').disabled() and numactl_dep= .found() numad_prog =3D find_program('numad', required: get_option('numad'), dirs= : libvirt_sbin_path) if numad_prog.found() conf.set('WITH_NUMAD', 1) - conf.set_quoted('NUMAD', numad_prog.path()) + conf.set_quoted('NUMAD', numad_prog.full_path()) endif elif get_option('numad').enabled() error('You must have numactl enabled for numad support.') @@ -2148,7 +2148,7 @@ if git configuration: spec_conf, ) =20 - authors =3D run_command(python3_prog, meson_gen_authors_prog.path(), + authors =3D run_command(python3_prog, meson_gen_authors_prog.full_path(), env: runutf8, check: true) authors_file =3D 'AUTHORS.rst.in' =20 @@ -2170,7 +2170,7 @@ if git =20 foreach file : dist_files meson.add_dist_script( - meson_python_prog.path(), python3_prog.path(), meson_dist_prog.path(= ), + meson_python_prog.full_path(), python3_prog.full_path(), meson_dist_= prog.full_path(), meson.project_build_root(), file ) endforeach diff --git a/src/access/meson.build b/src/access/meson.build index 4d563a1a60..07fd7d372e 100644 --- a/src/access/meson.build +++ b/src/access/meson.build @@ -120,6 +120,6 @@ generated_sym_files +=3D access_gen_sym test( 'check-aclperms', python3_prog, - args: [ check_aclperms_prog.path(), access_perm_h, files('viraccessperm.= c') ], + args: [ check_aclperms_prog.full_path(), access_perm_h, files('viraccess= perm.c') ], env: runutf8, ) diff --git a/src/meson.build b/src/meson.build index 916bf1c863..35951d8990 100644 --- a/src/meson.build +++ b/src/meson.build @@ -909,7 +909,7 @@ virt_install_dirs +=3D [ ] =20 meson.add_install_script( - meson_python_prog.path(), python3_prog.path(), meson_install_dirs_prog.p= ath(), + meson_python_prog.full_path(), python3_prog.full_path(), meson_install_d= irs_prog.full_path(), virt_install_dirs, ) =20 @@ -920,7 +920,7 @@ if host_machine.system() =3D=3D 'linux' test( 'check-symfile', python3_prog, - args: [ check_symfile_prog.path(), libvirt_syms, libvirt_lib ], + args: [ check_symfile_prog.full_path(), libvirt_syms, libvirt_lib ], env: runutf8, ) =20 @@ -928,7 +928,7 @@ if host_machine.system() =3D=3D 'linux' test( 'check-admin-symfile', python3_prog, - args: [ check_symfile_prog.path(), libvirt_admin_syms, libvirt_admin= _lib ], + args: [ check_symfile_prog.full_path(), libvirt_admin_syms, libvirt_= admin_lib ], env: runutf8, ) endif @@ -938,7 +938,7 @@ test( 'check-symsorting', python3_prog, args: [ - check_symsorting_prog.path(), + check_symsorting_prog.full_path(), meson.current_source_dir(), files(sym_files, used_sym_files), ], @@ -949,7 +949,7 @@ test( 'check-admin-symsorting', python3_prog, args: [ - check_symsorting_prog.path(), + check_symsorting_prog.full_path(), meson.current_source_dir(), libvirt_admin_private_syms, ], @@ -960,7 +960,7 @@ test( 'check-drivername', python3_prog, args: [ - check_drivername_prog.path(), files(driver_headers), + check_drivername_prog.full_path(), files(driver_headers), files('libvirt_public.syms'), libvirt_qemu_syms, libvirt_lxc_syms, ], env: runutf8, @@ -970,7 +970,7 @@ test( 'check-admin-drivername', python3_prog, args: [ - check_drivername_prog.path(), libvirt_admin_public_syms, + check_drivername_prog.full_path(), libvirt_admin_public_syms, ], env: runutf8, ) @@ -978,14 +978,14 @@ test( test( 'check-driverimpls', python3_prog, - args: [ check_driverimpls_prog.path(), driver_source_files ], + args: [ check_driverimpls_prog.full_path(), driver_source_files ], env: runutf8, ) =20 test( 'check-aclrules', python3_prog, - args: [ check_aclrules_prog.path(), files('remote/remote_protocol.x'), s= tateful_driver_source_files ], + args: [ check_aclrules_prog.full_path(), files('remote/remote_protocol.x= '), stateful_driver_source_files ], env: runutf8, ) =20 @@ -1010,11 +1010,11 @@ if pdwtags_prog.found() and cc.get_id() !=3D 'clang' 'check-@0@'.format(proto['name']), python3_prog, args: [ - check_remote_protocol_prog.path(), + check_remote_protocol_prog.full_path(), proto['name'], lib.name(), lib.full_path(), - pdwtags_prog.path(), + pdwtags_prog.full_path(), files('@0@-structs'.format(proto['name'])), ], env: runutf8, diff --git a/src/network/meson.build b/src/network/meson.build index 395074a0a0..d5f9ba2254 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -90,7 +90,7 @@ if conf.has('WITH_NETWORK') ) =20 meson.add_install_script( - meson_python_prog.path(), python3_prog.path(), meson_install_symlink_p= rog.path(), + meson_python_prog.full_path(), python3_prog.full_path(), meson_install= _symlink_prog.full_path(), confdir / 'qemu' / 'networks' / 'autostart', '../default.xml', 'default.xml', ) diff --git a/tests/meson.build b/tests/meson.build index 967a01fe14..1149211756 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -700,7 +700,7 @@ testenv +=3D 'VIR_TEST_FILE_ACCESS=3D1' add_test_setup( 'access', env: testenv, - exe_wrapper: [ python3_prog, check_file_access_prog.path() ], + exe_wrapper: [ python3_prog, check_file_access_prog.full_path() ], ) =20 add_test_setup( --=20 2.35.1 From nobody Thu May 2 04:17:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1665139488; cv=none; d=zohomail.com; s=zohoarc; b=EscwT9WVFSrbx2yUxmTZSh64GUzAb4BdbKfL4uDpLv9JzXrcZCGfyRrySCMyqSW3jKnUf7sY7VvliNhgV4228hhmBlUWmDXPYpl6uVpI0nE8CSPO5dG3X2NIMbySEya4Gt9qMKCJQGrdzyf4jRURsNDY1ud2Fe/CDjMX4ljDx/c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1665139488; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9Zr+JUw/Op4rE93rcLem6Sgkf0Fu7Bb1I1B6q0FNDa8=; b=bxdElXYKxob9FeLw8EPRtszjzDSWhjxqKjnOg2uqvVmKm+f183TQoUUnwM5ifGfpJfBKrMhs5jKI1wiLOo7da+8cDA0M/cLKZask3llaGQcw6KKRe24BIlpOUzjfEM+AOCh1+IcuaiAVATeoxtR4l9BEFZbe4Ns1CrStDJyJ0p0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1665139488912453.884180258249; Fri, 7 Oct 2022 03:44:48 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-110-eBXFGlx6MwSuRZCIrxHwSQ-1; Fri, 07 Oct 2022 06:44:44 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AC5B33825784; Fri, 7 Oct 2022 10:44:41 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9816B40C6F9F; Fri, 7 Oct 2022 10:44:41 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 72E1F1946A4E; Fri, 7 Oct 2022 10:44:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 31FE51946A6D for ; Fri, 7 Oct 2022 10:44:40 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 16C6F728FC; Fri, 7 Oct 2022 10:44:40 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id B0BA317582 for ; Fri, 7 Oct 2022 10:44:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665139487; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=9Zr+JUw/Op4rE93rcLem6Sgkf0Fu7Bb1I1B6q0FNDa8=; b=f3HOsAj+2tk6Wv9G3KlzSDThKxk49l5xafwG80Tw1Ibvwm8+SH97BE0ZJz2SxfmdIlrQzI lv9zSbfZKVJ4VAJWweokzGEwPBybvuBgnultTuvDNHoKNSMHwdHKrgcqTKNBr/ILmrCLqN y3zlZiWp7Ue+A1BXiKUPYj/yM16+QFA= X-MC-Unique: eBXFGlx6MwSuRZCIrxHwSQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 4/5] Replace dep.get_pkgconfig_variable() with dep.get_variable(pkgconfig:) Date: Fri, 7 Oct 2022 12:44:24 +0200 Message-Id: <22b721fe06cdf8ad4fef22c1bb1639f20b84b8f2.1665139419.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1665139490229100003 Content-Type: text/plain; charset="utf-8"; x-default="true" The get_pkgconfig_variable() method is deprecated in 0.56.0 and we're recommended to use get_variable(pkgconfig : ...) instead. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- meson.build | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index 822344e8a1..2d19d4b735 100644 --- a/meson.build +++ b/meson.build @@ -1267,10 +1267,10 @@ endif if wireshark_dep.found() wireshark_plugindir =3D get_option('wireshark_plugindir') if wireshark_plugindir =3D=3D '' - wireshark_plugindir =3D wireshark_dep.get_pkgconfig_variable('plugindi= r') + wireshark_plugindir =3D wireshark_dep.get_variable(pkgconfig : 'plugin= dir') endif =20 - wireshark_prefix =3D wireshark_dep.get_pkgconfig_variable('prefix') + wireshark_prefix =3D wireshark_dep.get_variable(pkgconfig : 'prefix') if wireshark_prefix =3D=3D '' # If wireshark's prefix cannot be retrieved from pkg-config, # this is our best bet. @@ -1318,7 +1318,7 @@ if yajl_dep.found() # # [1] https://github.com/Homebrew/homebrew-core/pull/74516 if host_machine.system() !=3D 'linux' - yajl_includedir =3D yajl_dep.get_pkgconfig_variable('includedir') + yajl_includedir =3D yajl_dep.get_variable(pkgconfig : 'includedir') if yajl_includedir.contains('include/yajl') rc =3D run_command( 'python3', '-c', @@ -1351,8 +1351,8 @@ endif if bash_completion_dep.found() bash_completion_dir =3D get_option('bash_completion_dir') if bash_completion_dir =3D=3D '' - bash_completion_dir =3D bash_completion_dep.get_pkgconfig_variable('co= mpletionsdir') - bash_completion_prefix =3D bash_completion_dep.get_pkgconfig_variable(= 'prefix') + bash_completion_dir =3D bash_completion_dep.get_variable(pkgconfig : '= completionsdir') + bash_completion_prefix =3D bash_completion_dep.get_variable(pkgconfig = : 'prefix') rc =3D run_command( 'python3', '-c', 'print("@0@".replace("@1@", "@2@"))'.format( @@ -1478,8 +1478,8 @@ if not get_option('driver_libxl').disabled() and conf= .has('WITH_LIBVIRTD') libxl_dep =3D dependency('xenlight', version: '>=3D' + libxl_version, re= quired: get_option('driver_libxl')) =20 if libxl_dep.found() - libxl_firmware_dir =3D libxl_dep.get_pkgconfig_variable('xenfirmwaredi= r') - libxl_execbin =3D libxl_dep.get_pkgconfig_variable('libexec_bin') + libxl_firmware_dir =3D libxl_dep.get_variable(pkgconfig : 'xenfirmware= dir') + libxl_execbin =3D libxl_dep.get_variable(pkgconfig : 'libexec_bin') if libxl_firmware_dir !=3D '' conf.set_quoted('LIBXL_FIRMWARE_DIR', libxl_firmware_dir) endif --=20 2.35.1 From nobody Thu May 2 04:17:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1665139487; cv=none; d=zohomail.com; s=zohoarc; b=KUKD0n0s/G2jcpn99gbW493saf5+7stCc0eEqmRgBfj1e4+S9cTuIN6VFnlutIKwi8A7c/du25Me5Liea9di4NRoGiTs9vpxkaSUc/IYhYpBP+YZr5TpO5xHf/48p8gImis7AJgYu2bx8Tm7LSVPj5c/svfoh/9RE6QtX8fMSx0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1665139487; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OkpX6wdoBKKwHNA/awsx2t9cXL44y4CZ+hDBo8/NCB0=; b=FTFaymLPj5i/yjCUNsCTPWuyQyrWDuWt8ZkWlWVvbmw2P/NDqBgU9YKg160I1b4Ng4myTdxf3uJyvZVZtKPeL1PUdZYDdWIpg008Xme9cDqBwY00TkXhloGp+hOzEpIkWDAjWSY4NRhPkLPjY73nCk0MBc1Pikhx0rtlEbiIU+E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1665139487213859.9971200271398; Fri, 7 Oct 2022 03:44:47 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-464-MDW7xfPMMz-6Yk-fCH-Cvg-1; Fri, 07 Oct 2022 06:44:44 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 057281012479; Fri, 7 Oct 2022 10:44:42 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id E771220290A6; Fri, 7 Oct 2022 10:44:41 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AFFA31946A78; Fri, 7 Oct 2022 10:44:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B575D1946A49 for ; Fri, 7 Oct 2022 10:44:40 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A983A17582; Fri, 7 Oct 2022 10:44:40 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4EBA5728FC for ; Fri, 7 Oct 2022 10:44:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665139486; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=OkpX6wdoBKKwHNA/awsx2t9cXL44y4CZ+hDBo8/NCB0=; b=Jc2WTxZglvQGd82gAGcV3sEGF8Gu4EKRzCMDzqyjTvdCQ0s30Ox24+s1ZNRn5sFJgkOahl 5WJTg3lwbXPB3AKXTGayJwKVySrFzYuIGowZryVFMLZEHHcsdV9IWQ3BzGUHDuuRK6qLta StlUFSH1Kn7Vtt1tIlgFI2/OEGEiGlo= X-MC-Unique: MDW7xfPMMz-6Yk-fCH-Cvg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 5/5] meson: Bump minimal required meson version Date: Fri, 7 Oct 2022 12:44:25 +0200 Message-Id: <50be1c9a2f06021f286f50a560a06c26a1cf7745.1665139419.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1665139488224100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Bump the minimal required version to 0.56.0. Looking into our CI this is the oldest version we install. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- libvirt.spec.in | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 950c5a3b6d..ba792345e7 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -271,7 +271,7 @@ Requires: libvirt-libs =3D %{version}-%{release} # listed against each sub-RPM BuildRequires: python3-docutils BuildRequires: gcc -BuildRequires: meson >=3D 0.54.0 +BuildRequires: meson >=3D 0.56.0 BuildRequires: ninja-build BuildRequires: git BuildRequires: perl-interpreter diff --git a/meson.build b/meson.build index 2d19d4b735..93de355430 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,7 @@ project( 'libvirt', 'c', version: '8.9.0', license: 'LGPLv2+', - meson_version: '>=3D 0.54.0', + meson_version: '>=3D 0.56.0', default_options: [ 'buildtype=3Ddebugoptimized', 'b_pie=3Dtrue', --=20 2.35.1