GNOME.org
 

[tracker-miners/wip/carlosg/parallel-installable: 4/27] build: Install versioned gsettings schemas

commit 7a93d17434043ebfa5d2a25ae7c4f7a923bc758a
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Feb 23 17:46:35 2020 +0100

    build: Install versioned gsettings schemas
    
    We still make those look into the same dconf paths than older
    versions, as we want configuration to be in sync.

 data/meson.build                                   | 36 ++++++++++++----------
 data/org.freedesktop.Tracker.Extract.gschema.xml   |  6 ++--
 data/org.freedesktop.Tracker.FTS.gschema.xml       |  2 +-
 ...org.freedesktop.Tracker.Miner.Files.gschema.xml |  6 ++--
 data/org.freedesktop.Tracker.Writeback.gschema.xml |  4 +--
 src/libtracker-miners-common/tracker-fts-config.c  |  2 +-
 src/miners/fs/tracker-config.c                     |  2 +-
 src/tracker-extract/tracker-config.c               |  2 +-
 src/tracker-writeback/tracker-config.c             |  2 +-
 9 files changed, 32 insertions(+), 30 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 5a382b313..f96acde04 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,26 +1,28 @@
-schemas = [
-  'org.freedesktop.Tracker.Extract.gschema.xml',
-  'org.freedesktop.Tracker.FTS.gschema.xml',
-  'org.freedesktop.Tracker.Miner.Files.gschema.xml',
-  'org.freedesktop.Tracker.Writeback.gschema.xml',
-]
-
-foreach schema : schemas
-  configure_file(
-    input: schema,
-    output: schema,
-    copy: true,
-    install: true,
-    install_dir: gsettings_schema_dir)
+schemas = {
+  'org.freedesktop.Tracker.Extract.gschema.xml': 'org.freedesktop.Tracker@0  Extract gschema 
xml'.format(tracker_api_major),
+  'org.freedesktop.Tracker.FTS.gschema.xml': 'org.freedesktop.Tracker@0  FTS gschema 
xml'.format(tracker_api_major),
+  'org.freedesktop.Tracker.Miner.Files.gschema.xml': 'org.freedesktop.Tracker@0  Miner Files gschema 
xml'.format(tracker_api_major),
+  'org.freedesktop.Tracker.Writeback.gschema.xml': 'org.freedesktop.Tracker@0  Writeback gschema 
xml'.format(tracker_api_major),
+}
+
+schemas_file_deps = []
+foreach source, dest : schemas
+    configure_file(
+        input: source,
+        output: dest,
+        copy: true,
+        install: true,
+        install_dir: gsettings_schema_dir)
+    schemas_file_deps += source
 endforeach
 
 tracker_miners_settings_enums = custom_target('tracker-miners-common-settings-enums',
     input: '../src/libtracker-miners-common/tracker-enums.h',
-    output: 'org.freedesktop.TrackerMiners.enums.xml',
+    output: 'org.freedesktop.TrackerMiners@0  enums xml'.format(tracker_api_major),
     command: [glib_mkenums,
               '--comments', '<!-- @comment@ -->',
               '--fhead', '<schemalist>',
-              '--vhead', '<@type@ id="org.freedesktop.TrackerMiners.@EnumName@">',
+              '--vhead', '<@type@ 
id="org.freedesktop.TrackerMiners@0@.@EnumName@">'.format(tracker_api_major),
               '--vprod', '    <value nick="@valuenick@" value="@valuenum@"/>',
               '--vtail', '  </@type@>',
               '--ftail', '</schemalist>', '@INPUT@'],
@@ -39,7 +41,7 @@ custom_target('tracker-miners-compile-schemas',
   command: [glib_compile_schemas, meson.current_build_dir()],
   build_by_default: true,
   depends: compile_schemas_deps,
-  depend_files: schemas)
+  depend_files: schemas_file_deps)
 
 tracker_miners_uninstalled_gsettings_schema_dir = meson.current_build_dir()
 
diff --git a/data/org.freedesktop.Tracker.Extract.gschema.xml 
b/data/org.freedesktop.Tracker.Extract.gschema.xml
index 173c9c946..2bd525db4 100644
--- a/data/org.freedesktop.Tracker.Extract.gschema.xml
+++ b/data/org.freedesktop.Tracker.Extract.gschema.xml
@@ -18,14 +18,14 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 Boston, MA  02110-1301, USA.
 -->
 <schemalist>
-  <schema id="org.freedesktop.Tracker.Extract" path="/org/freedesktop/tracker/extract/" 
gettext-domain="tracker-miners">
-    <key name="verbosity" enum="org.freedesktop.TrackerMiners.TrackerVerbosity">
+  <schema id="org.freedesktop.Tracker3.Extract" path="/org/freedesktop/tracker/extract/" 
gettext-domain="tracker-miners">
+    <key name="verbosity" enum="org.freedesktop.TrackerMiners3.TrackerVerbosity">
       <default>'errors'</default>
       <summary>Log verbosity</summary>
       <description>Log verbosity.</description>
     </key>
 
-    <key name="sched-idle" enum="org.freedesktop.TrackerMiners.TrackerSchedIdle">
+    <key name="sched-idle" enum="org.freedesktop.TrackerMiners3.TrackerSchedIdle">
       <default>'first-index'</default>
       <summary>Scheduler priority when idle</summary>
       <description>
diff --git a/data/org.freedesktop.Tracker.FTS.gschema.xml b/data/org.freedesktop.Tracker.FTS.gschema.xml
index 8129ca735..d9820a2ce 100644
--- a/data/org.freedesktop.Tracker.FTS.gschema.xml
+++ b/data/org.freedesktop.Tracker.FTS.gschema.xml
@@ -18,7 +18,7 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 Boston, MA  02110-1301, USA.
 -->
 <schemalist>
-  <schema id="org.freedesktop.Tracker.FTS" path="/org/freedesktop/tracker/fts/" 
gettext-domain="tracker-miners">
+  <schema id="org.freedesktop.Tracker3.FTS" path="/org/freedesktop/tracker/fts/" 
gettext-domain="tracker-miners">
 
     <key name="enable-stemmer" type="b">
       <summary>Enable stemmer</summary>
diff --git a/data/org.freedesktop.Tracker.Miner.Files.gschema.xml 
b/data/org.freedesktop.Tracker.Miner.Files.gschema.xml
index ae2266519..1e7a1ac25 100644
--- a/data/org.freedesktop.Tracker.Miner.Files.gschema.xml
+++ b/data/org.freedesktop.Tracker.Miner.Files.gschema.xml
@@ -18,8 +18,8 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 Boston, MA  02110-1301, USA.
 -->
 <schemalist>
-  <schema id="org.freedesktop.Tracker.Miner.Files" path="/org/freedesktop/tracker/miner/files/" 
gettext-domain="tracker-miners">
-    <key name="verbosity" enum="org.freedesktop.TrackerMiners.TrackerVerbosity">
+  <schema id="org.freedesktop.Tracker3.Miner.Files" path="/org/freedesktop/tracker/miner/files/" 
gettext-domain="tracker-miners">
+    <key name="verbosity" enum="org.freedesktop.TrackerMiners3.TrackerVerbosity">
       <default>'errors'</default>
       <summary>Log verbosity</summary>
       <description>Log verbosity.</description>
@@ -32,7 +32,7 @@ Boston, MA  02110-1301, USA.
       <default>15</default>
     </key>
 
-    <key name="sched-idle" enum="org.freedesktop.TrackerMiners.TrackerSchedIdle">
+    <key name="sched-idle" enum="org.freedesktop.TrackerMiners3.TrackerSchedIdle">
       <default>'first-index'</default>
       <summary>Scheduler priority when idle</summary>
       <description>
diff --git a/data/org.freedesktop.Tracker.Writeback.gschema.xml 
b/data/org.freedesktop.Tracker.Writeback.gschema.xml
index 597bd8df4..415dbfa6f 100644
--- a/data/org.freedesktop.Tracker.Writeback.gschema.xml
+++ b/data/org.freedesktop.Tracker.Writeback.gschema.xml
@@ -18,8 +18,8 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 Boston, MA  02110-1301, USA.
 -->
 <schemalist>
-  <schema id="org.freedesktop.Tracker.Writeback" path="/org/freedesktop/tracker/writeback/" 
gettext-domain="tracker-miners">
-    <key name="verbosity" enum="org.freedesktop.TrackerMiners.TrackerVerbosity">
+  <schema id="org.freedesktop.Tracker3.Writeback" path="/org/freedesktop/tracker/writeback/" 
gettext-domain="tracker-miners">
+    <key name="verbosity" enum="org.freedesktop.TrackerMiners3.TrackerVerbosity">
       <default>'errors'</default>
       <summary>Log verbosity</summary>
       <description>Log verbosity.</description>
diff --git a/src/libtracker-miners-common/tracker-fts-config.c 
b/src/libtracker-miners-common/tracker-fts-config.c
index a8df15cd8..1bbc64ec5 100644
--- a/src/libtracker-miners-common/tracker-fts-config.c
+++ b/src/libtracker-miners-common/tracker-fts-config.c
@@ -31,7 +31,7 @@
 
 #include "tracker-fts-config.h"
 
-#define CONFIG_SCHEMA "org.freedesktop.Tracker.FTS"
+#define CONFIG_SCHEMA "org.freedesktop.Tracker3.FTS"
 #define CONFIG_PATH   "/org/freedesktop/tracker/fts/"
 
 /* Default values */
diff --git a/src/miners/fs/tracker-config.c b/src/miners/fs/tracker-config.c
index 7aa700f68..9b8f002a8 100644
--- a/src/miners/fs/tracker-config.c
+++ b/src/miners/fs/tracker-config.c
@@ -33,7 +33,7 @@
 
 #include "tracker-config.h"
 
-#define CONFIG_SCHEMA "org.freedesktop.Tracker.Miner.Files"
+#define CONFIG_SCHEMA "org.freedesktop.Tracker3.Miner.Files"
 #define CONFIG_PATH   "/org/freedesktop/tracker/miner/files/"
 
 /* Default values */
diff --git a/src/tracker-extract/tracker-config.c b/src/tracker-extract/tracker-config.c
index 6ce3bcf25..ec24471fc 100644
--- a/src/tracker-extract/tracker-config.c
+++ b/src/tracker-extract/tracker-config.c
@@ -27,7 +27,7 @@
 
 #include "tracker-config.h"
 
-#define CONFIG_SCHEMA "org.freedesktop.Tracker.Extract"
+#define CONFIG_SCHEMA "org.freedesktop.Tracker3.Extract"
 #define CONFIG_PATH   "/org/freedesktop/tracker/extract/"
 
 static void     config_set_property         (GObject       *object,
diff --git a/src/tracker-writeback/tracker-config.c b/src/tracker-writeback/tracker-config.c
index f9f8a34a4..c523b046c 100644
--- a/src/tracker-writeback/tracker-config.c
+++ b/src/tracker-writeback/tracker-config.c
@@ -33,7 +33,7 @@
 
 #include "tracker-config.h"
 
-#define CONFIG_SCHEMA "org.freedesktop.Tracker.Writeback"
+#define CONFIG_SCHEMA "org.freedesktop.Tracker3.Writeback"
 #define CONFIG_PATH   "/org/freedesktop/tracker/writeback/"
 
 static void     config_set_property         (GObject           *object,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]