[nautilus] meson: Update to 0.59
- From: António Fernandes <antoniof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] meson: Update to 0.59
- Date: Mon, 28 Feb 2022 21:33:36 +0000 (UTC)
commit 035a95ea19188a79a852d7e290c139c183f17991
Author: Maximiliano Sandoval R <msandova gnome org>
Date: Fri Feb 18 17:03:14 2022 +0100
meson: Update to 0.59
data/meson.build | 2 +-
docs/reference/libnautilus-extension/meson.build | 2 +-
meson.build | 2 +-
src/meson.build | 10 +++++-----
test/meson.build | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 913ffd7b8..2df5a226c 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -13,7 +13,7 @@ install_data(
rename: '@0 -symbolic svg'.format(application_id)
)
-po_dir = join_paths(meson.source_root(), 'po')
+po_dir = join_paths(meson.project_source_root(), 'po')
desktop_conf = configuration_data()
diff --git a/docs/reference/libnautilus-extension/meson.build
b/docs/reference/libnautilus-extension/meson.build
index 44e4484f5..32af79e69 100644
--- a/docs/reference/libnautilus-extension/meson.build
+++ b/docs/reference/libnautilus-extension/meson.build
@@ -10,7 +10,7 @@ configure_file(
gnome.gtkdoc(
'libnautilus-extension',
main_xml: 'libnautilus-extension-docs.xml',
- src_dir: join_paths(meson.source_root(), 'libnautilus-extension'),
+ src_dir: join_paths(meson.project_source_root(), 'libnautilus-extension'),
dependencies: nautilus_extension,
install: true,
scan_args: [
diff --git a/meson.build b/meson.build
index f8973e020..c60460d02 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,7 @@ project('nautilus', 'c',
# * Update GTK-based codes over src/gtk/gtk-code-generator.sh
version: '43.alpha',
- meson_version: '>= 0.49.0',
+ meson_version: '>= 0.59.0',
license: 'GPL-3.0-or-later'
)
diff --git a/src/meson.build b/src/meson.build
index 4c171bd6d..fbd3c7735 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -26,7 +26,7 @@ libnautilus_sources = [
gnome.gdbus_codegen(
'nautilus-freedesktop-generated',
join_paths(
- meson.source_root(), 'data', 'freedesktop-dbus-interfaces.xml'
+ meson.project_source_root(), 'data', 'freedesktop-dbus-interfaces.xml'
),
interface_prefix: 'org.freedesktop',
namespace: 'NautilusFreedesktop'
@@ -34,7 +34,7 @@ libnautilus_sources = [
gnome.gdbus_codegen(
'nautilus-generated',
join_paths(
- meson.source_root(), 'data', 'dbus-interfaces.xml'
+ meson.project_source_root(), 'data', 'dbus-interfaces.xml'
),
interface_prefix: 'org.gnome.Nautilus',
namespace: 'NautilusDBus'
@@ -42,7 +42,7 @@ libnautilus_sources = [
gnome.gdbus_codegen(
'nautilus-generated2',
join_paths(
- meson.source_root(), 'data', 'dbus-interfaces2.xml'
+ meson.project_source_root(), 'data', 'dbus-interfaces2.xml'
),
interface_prefix: 'org.gnome.Nautilus',
namespace: 'NautilusDBus'
@@ -50,7 +50,7 @@ libnautilus_sources = [
gnome.gdbus_codegen(
'nautilus-shell-search-provider-generated',
join_paths(
- meson.source_root(), 'data', 'shell-search-provider-dbus-interfaces.xml'
+ meson.project_source_root(), 'data', 'shell-search-provider-dbus-interfaces.xml'
),
interface_prefix: 'org.gnome',
namespace: 'Nautilus'
@@ -310,7 +310,7 @@ if get_option('tests') == 'all'
],
env: [
'G_DEBUG=fatal-warnings',
- 'GSETTINGS_SCHEMA_DIR=@0@'.format(join_paths(meson.build_root(), 'data'))
+ 'GSETTINGS_SCHEMA_DIR=@0@'.format(join_paths(meson.project_build_root(), 'data'))
]
)
endif
diff --git a/test/meson.build b/test/meson.build
index deab2ffb8..07532fd2a 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -14,7 +14,7 @@
# G_TEST_BUILDDIR and G_TEST_SRCDIR cannot be preset, since
# the test sources are scattered.
test_env = [
- 'GSETTINGS_SCHEMA_DIR=@0@'.format(join_paths(meson.build_root(), 'data')),
+ 'GSETTINGS_SCHEMA_DIR=@0@'.format(join_paths(meson.project_build_root(), 'data')),
'RUNNING_TESTS=@0@'.format('TRUE')
]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]