Skip to content

Commit

Permalink
meson: Use gnome.post_install
Browse files Browse the repository at this point in the history
  • Loading branch information
A6GibKm authored and pothos committed Mar 18, 2022
1 parent 645b3a5 commit c2909d6
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ variables:
libnotify-devel libsecret-devel libpwquality-devel
libudisks2-devel xz-devel systemd-devel meson gcc
glibc-devel libhandy1-devel gettext git gobject-introspection-devel
vala
vala desktop-file-utils
OPTIONS: -Dman=false

flatpak:
Expand Down
2 changes: 1 addition & 1 deletion data/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ configure_file(

install_data(
'org.gnome.Disks.gschema.xml',
install_dir: gio_schemasdir,
install_dir: join_paths(gdu_datadir, 'glib-2.0', 'schemas')
)

info = 'org.gnome.DiskUtility.appdata.xml'
Expand Down
16 changes: 5 additions & 11 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
version: '42.0',
license: 'GPL2.0',
default_options: 'buildtype=debugoptimized',
meson_version: '>= 0.50.0',
meson_version: '>= 0.59.0',
)

gdu_name = meson.project_name()
Expand Down Expand Up @@ -83,12 +83,6 @@ udisk_dep = dependency('udisks2', version: '>= 2.7.6')

m_dep = cc.find_library('m')

gio_schemasdir = dependency('gio-2.0').get_pkgconfig_variable(
'schemasdir',
define_variable: ['datadir', gdu_prefix / gdu_datadir],
default: gdu_prefix / gdu_datadir / 'glib-2.0/schemas',
)

# *** Check for logind ***
logind = get_option('logind')
enable_logind = (logind != 'none')
Expand Down Expand Up @@ -121,10 +115,10 @@ configure_file(
configuration: config_h,
)

meson.add_install_script(
'meson_post_install.py',
gdu_datadir,
gio_schemasdir,
gnome.post_install(
gtk_update_icon_cache: true,
glib_compile_schemas: true,
update_desktop_database: true,
)

output = '\n gnome-disk-utility ' + gdu_version + '\n'
Expand Down
15 changes: 0 additions & 15 deletions meson_post_install.py

This file was deleted.

0 comments on commit c2909d6

Please sign in to comment.