gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-07-04 17:30:47 +00:00
Code Issues Projects Releases Wiki Activity

meson: Update to 0.59

Browse Source
This commit is contained in:
Maximiliano Sandoval R 2022-02-18 17:03:14 +01:00
parent f8936b5626
commit 035a95ea19
No known key found for this signature in database
GPG Key ID: D64A8D747F6FE706
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/meson.build
View File

@ -13,7 +13,7 @@ install_data(
rename: '@0@-symbolic.svg'.format(application_id) 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() desktop_conf = configuration_data()

2
docs/reference/libnautilus-extension/meson.build
View File

@ -10,7 +10,7 @@ configure_file(
gnome.gtkdoc( gnome.gtkdoc(
'libnautilus-extension', 'libnautilus-extension',
main_xml: 'libnautilus-extension-docs.xml', 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, dependencies: nautilus_extension,
install: true, install: true,
scan_args: [ scan_args: [

2
meson.build
View File

@ -6,7 +6,7 @@ project('nautilus', 'c',
# * Update GTK-based codes over src/gtk/gtk-code-generator.sh # * Update GTK-based codes over src/gtk/gtk-code-generator.sh
version: '43.alpha', version: '43.alpha',
meson_version: '>= 0.49.0', meson_version: '>= 0.59.0',
license: 'GPL-3.0-or-later' license: 'GPL-3.0-or-later'
) )

10
src/meson.build
View File

@ -26,7 +26,7 @@ libnautilus_sources = [
gnome.gdbus_codegen( gnome.gdbus_codegen(
'nautilus-freedesktop-generated', 'nautilus-freedesktop-generated',
join_paths( join_paths(
meson.source_root(), 'data', 'freedesktop-dbus-interfaces.xml' meson.project_source_root(), 'data', 'freedesktop-dbus-interfaces.xml'
), ),
interface_prefix: 'org.freedesktop', interface_prefix: 'org.freedesktop',
namespace: 'NautilusFreedesktop' namespace: 'NautilusFreedesktop'
@ -34,7 +34,7 @@ libnautilus_sources = [
gnome.gdbus_codegen( gnome.gdbus_codegen(
'nautilus-generated', 'nautilus-generated',
join_paths( join_paths(
meson.source_root(), 'data', 'dbus-interfaces.xml' meson.project_source_root(), 'data', 'dbus-interfaces.xml'
), ),
interface_prefix: 'org.gnome.Nautilus', interface_prefix: 'org.gnome.Nautilus',
namespace: 'NautilusDBus' namespace: 'NautilusDBus'
@ -42,7 +42,7 @@ libnautilus_sources = [
gnome.gdbus_codegen( gnome.gdbus_codegen(
'nautilus-generated2', 'nautilus-generated2',
join_paths( join_paths(
meson.source_root(), 'data', 'dbus-interfaces2.xml' meson.project_source_root(), 'data', 'dbus-interfaces2.xml'
), ),
interface_prefix: 'org.gnome.Nautilus', interface_prefix: 'org.gnome.Nautilus',
namespace: 'NautilusDBus' namespace: 'NautilusDBus'
@ -50,7 +50,7 @@ libnautilus_sources = [
gnome.gdbus_codegen( gnome.gdbus_codegen(
'nautilus-shell-search-provider-generated', 'nautilus-shell-search-provider-generated',
join_paths( 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', interface_prefix: 'org.gnome',
namespace: 'Nautilus' namespace: 'Nautilus'
@ -310,7 +310,7 @@ if get_option('tests') == 'all'
], ],
env: [ env: [
'G_DEBUG=fatal-warnings', '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 endif

2
test/meson.build
View File

@ -14,7 +14,7 @@
# G_TEST_BUILDDIR and G_TEST_SRCDIR cannot be preset, since # G_TEST_BUILDDIR and G_TEST_SRCDIR cannot be preset, since
# the test sources are scattered. # the test sources are scattered.
test_env = [ 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') 'RUNNING_TESTS=@0@'.format('TRUE')
] ]