[gvfs] build: Reuse schemas and GIO modules paths variables
- From: Iñigo Martínez <inigomartinez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gvfs] build: Reuse schemas and GIO modules paths variables
- Date: Wed, 21 Mar 2018 18:24:13 +0000 (UTC)
commit ed563a1b5192a769e0bb0824a8903a720df42264
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Mon Mar 19 20:45:16 2018 +0100
build: Reuse schemas and GIO modules paths variables
meson's post install script, compiles glib schemas and creates a
cache from the GIO modules. To do this, an assumption is made
regarding the directories where the files are installed under
prefix.
However, the final directories are available as meson variables
and these can be passed to the post install script, so there is
no need to make any assumption.
https://bugzilla.gnome.org/show_bug.cgi?id=794365
meson.build | 4 ++--
meson_post_install.py | 6 ++----
2 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/meson.build b/meson.build
index 061db74..7bf83b9 100644
--- a/meson.build
+++ b/meson.build
@@ -515,8 +515,8 @@ configure_file(
meson.add_install_script(
'meson_post_install.py',
- gvfs_datadir,
- gvfs_libdir
+ gvfs_schema_dir,
+ gio_module_dir
)
output = gvfs_name + ' ' + gvfs_version + ' configuration summary:\n'
diff --git a/meson_post_install.py b/meson_post_install.py
index 4232625..d9cc6f4 100644
--- a/meson_post_install.py
+++ b/meson_post_install.py
@@ -5,10 +5,8 @@ import subprocess
import sys
if not os.environ.get('DESTDIR'):
- schemadir = os.path.join(sys.argv[1], 'glib-2.0', 'schemas')
print('Compiling gsettings schemas...')
- subprocess.call(['glib-compile-schemas', schemadir])
+ subprocess.call(['glib-compile-schemas', sys.argv[1]])
- giomoduledir = os.path.join(sys.argv[2], 'gio', 'modules')
print('GIO module cache creation...')
- subprocess.call(['gio-querymodules', giomoduledir])
+ subprocess.call(['gio-querymodules', sys.argv[2]])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]