[gnome-tour/bilelmoussaoui/fixes] meson: use gnome.post_install
- From: Bilal Elmoussaoui <bilelmoussaoui src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-tour/bilelmoussaoui/fixes] meson: use gnome.post_install
- Date: Wed, 26 Jan 2022 19:10:40 +0000 (UTC)
commit 9f8d12ff54788f621e5a4208042f80de16962bf5
Author: Bilal Elmoussaoui <belmouss redhat com>
Date: Wed Jan 26 20:06:49 2022 +0100
meson: use gnome.post_install
build-aux/meson_post_install.py | 12 ------------
meson.build | 14 +++++++++-----
src/meson.build | 8 ++++----
3 files changed, 13 insertions(+), 21 deletions(-)
---
diff --git a/meson.build b/meson.build
index 8bda926..439cba8 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@ project('gnome-tour',
'rust',
version: '41.rc',
license: 'GPL-3.0-or-later',
- meson_version : '>= 0.50')
+ meson_version : '>= 0.59')
i18n = import('i18n')
gnome = import('gnome')
@@ -30,7 +30,7 @@ localedir = prefix / get_option('localedir')
datadir = prefix / get_option('datadir')
pkgdatadir = datadir / meson.project_name()
iconsdir = datadir / 'icons'
-podir =meson.source_root () / 'po'
+podir =meson.project_source_root () / 'po'
gettext_package = meson.project_name()
@@ -52,8 +52,8 @@ application_id = '@0@@1@'.format(base_id, profile)
meson.add_dist_script(
'build-aux/dist-vendor.sh',
- meson.build_root() / 'meson-dist' / meson.project_name() + '-' + version,
- meson.source_root()
+ meson.project_build_root() / 'meson-dist' / meson.project_name() + '-' + version,
+ meson.project_source_root()
)
if get_option('profile') == 'development'
@@ -66,4 +66,8 @@ subdir('data')
subdir('po')
subdir('src')
-meson.add_install_script('build-aux/meson_post_install.py')
+gnome.post_install(
+ gtk_update_icon_cache: true,
+ update_desktop_database: true,
+)
+
diff --git a/src/meson.build b/src/meson.build
index ef03e99..633bea1 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -13,8 +13,8 @@ config = configure_file(
# Copy the config.rs output to the source directory.
run_command(
'cp',
- meson.build_root() / 'src' / 'config.rs',
- meson.source_root() / 'src' / 'config.rs',
+ meson.project_build_root() / 'src' / 'config.rs',
+ meson.project_source_root() / 'src' / 'config.rs',
check: true
)
@@ -47,8 +47,8 @@ custom_target(
depends: resources,
command: [
cargo_script,
- meson.build_root(),
- meson.source_root(),
+ meson.project_build_root(),
+ meson.project_source_root(),
'@OUTPUT@',
profile,
meson.project_name(),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]