From deb6f1e14a278bbf3422dbb0bdd6b32f59790f9c Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Fri, 7 Oct 2022 21:11:08 -0400 Subject: [PATCH] build: Use GNOME module post_install() --- build-aux/meson_post_install.py | 14 -------------- meson.build | 10 ++++++---- 2 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 build-aux/meson_post_install.py diff --git a/build-aux/meson_post_install.py b/build-aux/meson_post_install.py deleted file mode 100644 index 6d18340..0000000 --- a/build-aux/meson_post_install.py +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env python3 - -from os import environ, path -from subprocess import call - -if not environ.get('DESTDIR', ''): - PREFIX = environ.get('MESON_INSTALL_PREFIX', '/usr/local') - DATA_DIR = path.join(PREFIX, 'share') - print('Updating icon cache...') - call(['gtk-update-icon-cache', '-qtf', path.join(DATA_DIR, 'icons/hicolor')]) - print("Compiling new schemas") - call(["glib-compile-schemas", path.join(DATA_DIR, 'glib-2.0/schemas')]) - print("Updating desktop database") - call(["update-desktop-database", path.join(DATA_DIR, 'applications')]) diff --git a/meson.build b/meson.build index 0eeda79..c9aac1f 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gnome-taquin', 'vala', 'c', - version: '3.38.1') + version: '3.38.1', meson_version: '>= 0.59.0',) project_id = 'org.gnome.Taquin' @@ -48,6 +48,8 @@ subdir('help') subdir('po') subdir('src') -meson.add_install_script(python3.find_python().path(), join_paths(meson.source_root(), - 'build-aux', - 'meson_post_install.py')) +gnome.post_install( + glib_compile_schemas: true, + gtk_update_icon_cache: true, + update_desktop_database: true, +) -- GitLab