mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-10-02 14:03:39 +00:00
meson: Update to 0.59
This commit is contained in:
parent
f8936b5626
commit
035a95ea19
|
@ -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()
|
||||
|
||||
|
|
|
@ -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: [
|
||||
|
|
|
@ -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'
|
||||
)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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')
|
||||
]
|
||||
|
||||
|
|
Loading…
Reference in a new issue