Skip to content

Commit

Permalink
Modernize meson (#124)
Browse files Browse the repository at this point in the history
  • Loading branch information
lenemter authored Jan 29, 2024
1 parent 979fe54 commit 5dddde8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 25 deletions.
6 changes: 3 additions & 3 deletions data/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ act_interfacesdir = act_dep.get_variable('interfacesdir', pkgconfig_define: ['da

meson.add_install_script(
symlink,
join_paths(dbus_interfaces_dir, 'io.elementary.SettingsDaemon.AccountsService.xml'),
join_paths(act_interfacesdir, 'io.elementary.SettingsDaemon.AccountsService.xml'),
dbus_interfaces_dir / 'io.elementary.SettingsDaemon.AccountsService.xml',
act_interfacesdir / 'io.elementary.SettingsDaemon.AccountsService.xml',
)

install_data(
'io.elementary.settings-daemon.gschema.xml',
install_dir: join_paths(datadir, 'glib-2.0', 'schemas')
install_dir: datadir / 'glib-2.0' / 'schemas'
)

i18n.merge_file(
Expand Down
8 changes: 5 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ project('io.elementary.settings-daemon',
'c', 'vala',
version: '1.3.1',
license: 'GPL3',
meson_version: '>=0.58.0'
meson_version: '>=0.59.0'
)

gnome = import('gnome')

fwupd_dep = dependency('fwupd')
gio_dep = dependency ('gio-2.0')
glib_dep = dependency('glib-2.0')
Expand Down Expand Up @@ -45,11 +47,11 @@ config_dep = declare_dependency(
include_directories: include_directories('.')
)

symlink = join_paths(meson.current_source_dir (), 'meson', 'create-symlink.sh')
symlink = meson.current_source_dir () / 'meson' / 'create-symlink.sh'

subdir('data')
subdir('po')
subdir('src')
subdir('settings-portal')

meson.add_install_script('meson/post_install.py')
gnome.post_install(glib_compile_schemas: true, gtk_update_icon_cache: true, update_desktop_database: true)
19 changes: 0 additions & 19 deletions meson/post_install.py

This file was deleted.

0 comments on commit 5dddde8

Please sign in to comment.