[tracker-miners/wip/carlosg/tracker-3.0-api-breaks: 57/57] build: Remove trick to merge schemas enums with tracker subproject
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners/wip/carlosg/tracker-3.0-api-breaks: 57/57] build: Remove trick to merge schemas enums with tracker subproject
- Date: Wed, 12 Feb 2020 15:30:25 +0000 (UTC)
commit 9423b104cec34af225e959d3264a7910c29daedb
Author: Carlos Garnacho <carlosg gnome org>
Date: Wed Feb 12 16:08:24 2020 +0100
build: Remove trick to merge schemas enums with tracker subproject
The tracker repo does not install gschemas anymore, so this is not
required.
data/meson.build | 28 ----------------------------
1 file changed, 28 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 559144b9c..a1c41560e 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -34,34 +34,6 @@ tracker_miners_settings_enums = custom_target('tracker-miners-common-settings-en
#
compile_schemas_deps = [tracker_miners_settings_enums]
-if get_option('tracker_core') == 'subproject'
- # Here we do an ugly dance to place GSettings schemas from tracker
- # and tracker-miners into the same directory. The `glib-compile-schemas`
- # tool cannot combine schemas from multiple directories, and the
- # GSETTINGS_SCHEMA_DIR environment variable cannot point to multiple
- # directories, so this appears to be our only option.
-
- foreach schema : tracker_gsettings_schemas
- target = configure_file(
- input: schema,
- output: '@PLAINNAME@',
- copy: true)
- endforeach
-
- dep = custom_target('tracker-store-settings-enums',
- input: tracker_common_enums_header,
- output: 'org.freedesktop.Tracker.enums.xml',
- command: [glib_mkenums,
- '--comments', '<!-- @comment@ -->',
- '--fhead', '<schemalist>',
- '--vhead', '<@type@ id="org.freedesktop.Tracker.@EnumName@">',
- '--vprod', ' <value nick="@valuenick@" value="@valuenum@"/>',
- '--vtail', ' </@type@>',
- '--ftail', '</schemalist>', '@INPUT@'],
- capture: true)
- compile_schemas_deps += [dep]
-endif
-
custom_target('tracker-miners-compile-schemas',
output: 'gschemas.compiled',
command: [glib_compile_schemas, meson.current_build_dir()],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]