meson: remove deprecated ExternalProgram.path

Replaced by full_path:
https://mesonbuild.com/Reference-manual_returned_external_program.html#external_programpath

ExternalProgram.full_path was added in meson 0.55 but we support meson
>= 0.51. Because of that, use path or full_path conditionally depending
on the meson version.

This gets rid of the following deprecation warning:
  NOTICE: Future-deprecated features used:
   * 0.48.0: {'module python3'}
   * 0.55.0: {'ExternalProgram.path'}
This commit is contained in:
Íñigo Huguet 2024-04-02 17:14:44 +02:00 committed by Íñigo Huguet
parent 3b72f19694
commit ef2438414f
5 changed files with 41 additions and 15 deletions

View file

@ -70,7 +70,7 @@ if enable_introspection
input: [merge_cmd, nm_property_infos_xml[name], nm_settings_docs_xml_gir[name]],
output: 'nm-settings-docs-' + name + '.xml',
command: [
python.path(),
python_path,
merge_cmd,
'@OUTPUT@',
nm_property_infos_xml[name],
@ -84,7 +84,7 @@ if enable_introspection
input: [merge_cmd, nm_property_infos_xml[name], gen_metadata_nm_settings_nmcli_xml, nm_settings_docs_xml_gir[name]],
output: 'nm-settings-docs-' + name + '.xml',
command: [
python.path(),
python_path,
merge_cmd,
'@OUTPUT@',
'--only-properties-from',

View file

@ -571,7 +571,11 @@ if enable_ppp
if pppd_path == ''
pppd = find_program('pppd', '/sbin/pppd', '/usr/sbin/pppd', required: false)
assert(pppd.found(), 'pppd required but not found, please provide a valid pppd path or use -Dppp=false to disable it')
pppd_path = pppd.path()
if meson.version().version_compare('>= 0.55')
pppd_path = pppd.full_path()
else
pppd_path = pppd.path()
endif
endif
config_h.set_quoted('PPPD_PATH', pppd_path)
@ -625,7 +629,11 @@ foreach client : [ 'dhclient', 'dhcpcd', 'dhcpcanon' ]
'/usr/local/sbin/' + client,
required : false)
if client_prog.found()
client_path = client_prog.path()
if meson.version().version_compare('>= 0.55')
client_path = client_prog.full_path()
else
client_path = client_prog.path()
endif
else
client_path = '/usr/sbin/' + client
message('@0@ not found, assume path @1@'.format(client, client_path))
@ -667,7 +675,11 @@ foreach prog_name : ['resolvconf', 'netconfig']
'/usr/local/sbin/' + prog_name,
required : false)
if prog.found()
prog_path = prog.path()
if meson.version().version_compare('>= 0.55')
prog_path = prog.full_path()
else
prog_path = prog.path()
endif
else
prog_enable = false
endif
@ -705,7 +717,11 @@ foreach prog : progs
search_paths += (path + '/' + prog[0])
endforeach
exe = find_program(search_paths, required : false)
path = exe.found() ? exe.path() : prog[2]
if meson.version().version_compare('>= 0.55')
path = exe.found() ? exe.full_path() : prog[2]
else
path = exe.found() ? exe.path() : prog[2]
endif
endif
name = prog[0].to_upper() + '_PATH'
config_h.set_quoted(name, path)
@ -864,13 +880,18 @@ if enable_valgrind
if valgrind_suppressions_path == ''
valgrind_suppressions_path = join_paths(source_root, 'valgrind.suppressions')
endif
if meson.version().version_compare('>= 0.55')
valgrind_path = valgrind.full_path()
else
valgrind_path = valgrind.path()
endif
endif
test_args = [
'--called-from-make',
build_root,
'',
enable_valgrind ? valgrind.path() : '',
enable_valgrind ? valgrind_path : '',
enable_valgrind ? valgrind_suppressions_path : '',
'--launch-dbus=auto',
]
@ -879,7 +900,12 @@ python_mod = import('python')
python = python_mod.find_installation('python3', required: false)
if python.found()
config_h.set_quoted('TEST_NM_PYTHON', python.path())
if meson.version().version_compare('>= 0.55')
python_path = python.full_path()
else
python_path = python.path()
endif
config_h.set_quoted('TEST_NM_PYTHON', python_path)
endif
data_conf = configuration_data()
@ -1113,7 +1139,7 @@ output += ' more-logging: ' + more_logging.to_string() + '\n'
output += ' warning-level: ' + get_option('warning_level') + '\n'
output += ' valgrind: ' + enable_valgrind.to_string()
if enable_valgrind
output += ' ' + valgrind.path()
output += ' ' + valgrind_path
endif
output += '\n'
output += ' code coverage: ' + get_option('b_coverage').to_string() + '\n'

View file

@ -190,7 +190,7 @@ if enable_introspection
input: [gen_infos_cmd, libnm_gir[0]] + libnm_core_settings_sources,
output: 'nm-property-infos-' + name + '.xml',
command: [
python.path(),
python_path,
gen_infos_cmd,
name,
'@OUTPUT@',
@ -206,7 +206,7 @@ if enable_introspection
'env',
'GI_TYPELIB_PATH=' + gi_typelib_path,
'LD_LIBRARY_PATH=' + ld_library_path,
python.path(),
python_path,
gen_gir_cmd,
'--lib-path', meson.current_build_dir(),
'--gir', libnm_gir[0],

View file

@ -9,7 +9,7 @@ if enable_docs
input: [merge_cmd, nm_settings_docs_xml_gir['nmcli'], nm_property_infos_xml['nmcli']],
output: 'settings-docs-input.xml',
command: [
python.path(),
python_path,
merge_cmd,
'@OUTPUT@',
nm_property_infos_xml['nmcli'],
@ -23,7 +23,7 @@ if enable_docs
input: [gen_cmd, settings_docs_input_xml],
output: 'settings-docs.h',
command: [
python.path(),
python_path,
gen_cmd,
'--output', '@OUTPUT@',
'--xml', settings_docs_input_xml

View file

@ -6,7 +6,7 @@ test(
args: [
build_root,
source_root,
python.path(),
python_path,
'--',
'TestNmcli',
],
@ -23,7 +23,7 @@ if enable_nm_cloud_setup
args: [
build_root,
source_root,
python.path(),
python_path,
'--',
'TestNmCloudSetup',
],