summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÍñigo Huguet <ihuguet@redhat.com>2024-04-02 17:09:58 +0200
committerÍñigo Huguet <inigohuguet@hotmail.com>2024-04-04 08:13:38 +0000
commit3b72f196945f59bd3896cce66507f8de7f607459 (patch)
tree0a6c2f5258cf08c3610844063ea1a9bfc8af39bd
parent07f463bc94e043f5c07d2835a9781223d85fc316 (diff)
meson: replace deprecated meson.source_root
Instead, meson.current_source_root or meson.project_source_root should be used: https://mesonbuild.com/Reference-manual_builtin_meson.html#mesonsource_root Also, the documentation referenced above suggest to use `files()` as a better alternative to refer to files, so do that at the same time. This gets rid of the deprecation warning: NOTICE: Future-deprecated features used: * 0.56.0: {'meson.source_root'}
-rw-r--r--man/meson.build2
-rw-r--r--meson.build2
-rw-r--r--src/libnm-client-impl/meson.build4
-rw-r--r--src/libnm-client-impl/tests/meson.build4
-rw-r--r--src/libnmc-setting/meson.build4
5 files changed, 8 insertions, 8 deletions
diff --git a/man/meson.build b/man/meson.build
index f0113cd5d3..17287a74da 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -62,7 +62,7 @@ foreach man: mans
endforeach
if enable_introspection
- merge_cmd = join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-merge.py')
+ merge_cmd = files(source_root / 'tools' / 'generate-docs-nm-settings-docs-merge.py')
name = 'dbus'
nm_settings_docs_xml_dbus = custom_target(
diff --git a/meson.build b/meson.build
index 6dd2aeba57..1df25ca60b 100644
--- a/meson.build
+++ b/meson.build
@@ -77,7 +77,7 @@ pkg = import('pkgconfig')
source_root = meson.current_source_dir()
build_root = meson.current_build_dir()
-po_dir = join_paths(meson.source_root(), 'po')
+po_dir = source_root / 'po'
top_inc = include_directories('.')
diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build
index 3f8ce5b1fc..8a4c3e4366 100644
--- a/src/libnm-client-impl/meson.build
+++ b/src/libnm-client-impl/meson.build
@@ -177,8 +177,8 @@ if enable_introspection
endif
ld_library_path = meson.current_build_dir() + ld_library_path
- gen_infos_cmd = join_paths(meson.source_root(), 'tools', 'generate-docs-nm-property-infos.py')
- gen_gir_cmd = join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')
+ gen_infos_cmd = files(source_root / 'tools' / 'generate-docs-nm-property-infos.py')
+ gen_gir_cmd = files(source_root / 'tools' / 'generate-docs-nm-settings-docs-gir.py')
names = [ 'dbus', 'nmcli', 'keyfile' ]
if enable_ifcfg_rh
diff --git a/src/libnm-client-impl/tests/meson.build b/src/libnm-client-impl/tests/meson.build
index 0c0e188b77..42e9883e77 100644
--- a/src/libnm-client-impl/tests/meson.build
+++ b/src/libnm-client-impl/tests/meson.build
@@ -50,9 +50,9 @@ if enable_introspection
'check-local-libnm-gir',
python,
args: [
- join_paths(meson.source_root(), 'src', 'libnm-client-impl', 'tests', 'test-gir.py'),
+ join_paths(source_root, 'src', 'libnm-client-impl', 'tests', 'test-gir.py'),
'--gir', libnm_gir[0],
- '--ver', join_paths(meson.source_root(), 'src', 'libnm-client-impl', 'libnm.ver'),
+ '--ver', join_paths(source_root, 'src', 'libnm-client-impl', 'libnm.ver'),
],
)
endif
diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build
index 7fb460dc33..70138d8b51 100644
--- a/src/libnmc-setting/meson.build
+++ b/src/libnmc-setting/meson.build
@@ -3,7 +3,7 @@
if enable_docs
assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
- merge_cmd = join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-merge.py')
+ merge_cmd = files(source_root / 'tools' / 'generate-docs-nm-settings-docs-merge.py')
settings_docs_input_xml = custom_target(
'settings-docs-input.xml',
input: [merge_cmd, nm_settings_docs_xml_gir['nmcli'], nm_property_infos_xml['nmcli']],
@@ -17,7 +17,7 @@ if enable_docs
],
)
- gen_cmd = join_paths(meson.source_root(), 'tools', 'generate-docs-settings-docs.py')
+ gen_cmd = files(source_root / 'tools' / 'generate-docs-settings-docs.py')
settings_docs_source = custom_target(
'settings-docs.h',
input: [gen_cmd, settings_docs_input_xml],