From 7c23c3db2ff778121ba8214ac0f2d8d2c9b465d5 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Thu, 11 Jan 2024 13:06:33 +0100 Subject: [PATCH] build: resolve deprecated 'copy' key argument in configure_file warning Resolves the following warning: NOTICE: Future-deprecated features used: * 0.64.0: {'copy arg in configure_file'} copy arg was deprecated in meson version 0.64. Hence, use fs.copyfile() that is also introduced in 0.64, in versions since 0.64 and use the old approach for older versions. --- data/meson.build | 21 +++++++++++++++------ meson.build | 5 +++++ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/data/meson.build b/data/meson.build index 7063d00e..1d0c9aeb 100644 --- a/data/meson.build +++ b/data/meson.build @@ -11,12 +11,21 @@ service_conf = { } # DBus Service file -configure_file( - input: 'org.freedesktop.ModemManager1.conf.@0@polkit'.format(enable_polkit ? '' : 'no'), - output: '@BASENAME@', - copy: true, - install_dir: dbus_policy_dir, -) +if meson_version.version_compare('>=0.64') + fs.copyfile( + 'org.freedesktop.ModemManager1.conf.@0@polkit'.format(enable_polkit ? '' : 'no'), + '@BASENAME@', + install: true, + install_dir: dbus_policy_dir, + ) +else + configure_file( + input: 'org.freedesktop.ModemManager1.conf.@0@polkit'.format(enable_polkit ? '' : 'no'), + output: '@BASENAME@', + copy: true, + install_dir: dbus_policy_dir, + ) +endif # DBus Activation file configure_file( diff --git a/meson.build b/meson.build index 503ff016..9f928bc6 100644 --- a/meson.build +++ b/meson.build @@ -13,6 +13,11 @@ project( meson_version: '>= 0.53.0', ) +meson_version = meson.version() +if meson_version.version_compare('>=0.64') + fs = import('fs') +endif + mm_name = meson.project_name() mm_version = meson.project_version() version_array = mm_version.split('.')