[tracker/wip/carlosg/tracker-3.0-api-breaks: 89/100] libtracker-fts: Drop TrackerFTSConfig



commit 98fc00ca849e1ede6dfe37067fd281f347efd455
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue Feb 4 23:04:13 2020 +0100

    libtracker-fts: Drop TrackerFTSConfig
    
    These settings are no longer read through settings, at least from
    library bits.
    
    Since we no longer need the settings, we no longer need the schemas,
    and we don't need the testsuite envvars to have things look into the
    right gschema dirs, and we don't need to compile schemas either.

 data/meson.build                             |  39 ---
 data/org.freedesktop.Tracker.FTS.gschema.xml |  61 ----
 data/org.freedesktop.Tracker.gschema.xml     |  24 --
 meson.build                                  |   3 -
 meson_integration_commands.sh                |  15 -
 src/libtracker-fts/meson.build               |   1 -
 src/libtracker-fts/tracker-fts-config.c      | 400 ---------------------------
 src/libtracker-fts/tracker-fts-config.h      |  74 -----
 src/libtracker-fts/tracker-fts-tokenizer.c   |   1 -
 tests/functional-tests/configuration.json.in |   1 -
 tests/functional-tests/configuration.py      |   1 -
 tests/functional-tests/ipc/meson.build       |   1 -
 tests/functional-tests/meson.build           |   1 -
 tests/meson.build                            |   1 -
 14 files changed, 623 deletions(-)
---
diff --git a/meson.build b/meson.build
index b5a9950c3..c7242728e 100644
--- a/meson.build
+++ b/meson.build
@@ -307,7 +307,6 @@ typelib_dir = gobject_introspection.get_pkgconfig_variable('typelibdir',
                                                            define_variable:  [ 'libdir', libdir ])
 
 subdir('src')
-subdir('data')
 subdir('docs')
 subdir('examples')
 subdir('utils')
@@ -348,8 +347,6 @@ if not get_option('override_sqlite_version_check')
     endif
 endif
 
-meson.add_install_script('meson_integration_commands.sh', glib_compile_schemas.path(), gsettings_schema_dir)
-
 summary = [
   '\nBuild Configuration:',
   '    Prefix:                                 ' + get_option('prefix'),
diff --git a/src/libtracker-fts/meson.build b/src/libtracker-fts/meson.build
index 2d340f0a1..43900478a 100644
--- a/src/libtracker-fts/meson.build
+++ b/src/libtracker-fts/meson.build
@@ -8,7 +8,6 @@ libtracker_fts_dependencies = [sqlite]
 
 libtracker_fts = static_library('tracker-fts',
     'tracker-fts.c',
-    'tracker-fts-config.c',
     'tracker-fts-tokenizer.c',
     libtracker_fts_fts5,
     dependencies: [tracker_common_dep],
diff --git a/src/libtracker-fts/tracker-fts-tokenizer.c b/src/libtracker-fts/tracker-fts-tokenizer.c
index 6367b0e1c..a6244af9d 100644
--- a/src/libtracker-fts/tracker-fts-tokenizer.c
+++ b/src/libtracker-fts/tracker-fts-tokenizer.c
@@ -31,7 +31,6 @@
 #include <libtracker-data/tracker-ontologies.h>
 
 #include "tracker-fts-tokenizer.h"
-#include "tracker-fts-config.h"
 #include "fts5.h"
 
 typedef struct TrackerTokenizerData TrackerTokenizerData;
diff --git a/tests/functional-tests/configuration.json.in b/tests/functional-tests/configuration.json.in
index c3b71b42d..d50080141 100644
--- a/tests/functional-tests/configuration.json.in
+++ b/tests/functional-tests/configuration.json.in
@@ -1,7 +1,6 @@
 {
     "TEST_DBUS_DAEMON_CONFIG_FILE": "@TEST_DBUS_DAEMON_CONFIG_FILE@",
     "TEST_DCONF_PROFILE": "@TEST_DCONF_PROFILE@",
-    "TEST_GSETTINGS_SCHEMA_DIR": "@TEST_GSETTINGS_SCHEMA_DIR@",
     "TEST_LANGUAGE_STOP_WORDS_DIR": "@TEST_LANGUAGE_STOP_WORDS_DIR@",
     "TEST_ONTOLOGIES_DIR": "@TEST_ONTOLOGIES_DIR@",
     "TEST_DOMAIN_ONTOLOGY_RULE": "@TEST_DOMAIN_ONTOLOGY_RULE@"
diff --git a/tests/functional-tests/configuration.py b/tests/functional-tests/configuration.py
index cd5cb0cfb..1dff3f417 100644
--- a/tests/functional-tests/configuration.py
+++ b/tests/functional-tests/configuration.py
@@ -40,7 +40,6 @@ TEST_DBUS_DAEMON_CONFIG_FILE = config['TEST_DBUS_DAEMON_CONFIG_FILE']
 def test_environment(tmpdir):
     return {
         'DCONF_PROFILE': config['TEST_DCONF_PROFILE'],
-        'GSETTINGS_SCHEMA_DIR': config['TEST_GSETTINGS_SCHEMA_DIR'],
         'TRACKER_DB_ONTOLOGIES_DIR': config['TEST_ONTOLOGIES_DIR'],
         'TRACKER_LANGUAGE_STOP_WORDS_DIR': config['TEST_LANGUAGE_STOP_WORDS_DIR'],
         'TRACKER_TEST_DOMAIN_ONTOLOGY_RULE': config['TEST_DOMAIN_ONTOLOGY_RULE'],
diff --git a/tests/functional-tests/ipc/meson.build b/tests/functional-tests/ipc/meson.build
index 839fcefdc..73b41b3b3 100644
--- a/tests/functional-tests/ipc/meson.build
+++ b/tests/functional-tests/ipc/meson.build
@@ -7,7 +7,6 @@ sandbox_args = ['-m', 'trackertestutils', '--dbus-config', test_dbus_config, '--
 
 sandbox_env = environment()
 
-test_env.set('GSETTINGS_SCHEMA_DIR', tracker_uninstalled_gsettings_schema_dir)
 test_env.set('LANG', 'en_GB.utf-8')
 test_env.prepend('PYTHONPATH', tracker_uninstalled_testutils_dir)
 test_env.set('TRACKER_DB_ONTOLOGIES_DIR', tracker_uninstalled_nepomuk_ontologies_dir)
diff --git a/tests/functional-tests/meson.build b/tests/functional-tests/meson.build
index cd9b27c32..f3f3305ca 100644
--- a/tests/functional-tests/meson.build
+++ b/tests/functional-tests/meson.build
@@ -11,7 +11,6 @@ test_dbus_config = join_paths(build_root, 'tests', 'test-bus.conf')
 testconf.set('TEST_DBUS_DAEMON_CONFIG_FILE', test_dbus_config)
 testconf.set('TEST_DCONF_PROFILE', dconf_profile_full_path)
 testconf.set('TEST_DOMAIN_ONTOLOGY_RULE', tracker_uninstalled_domain_rule)
-testconf.set('TEST_GSETTINGS_SCHEMA_DIR', tracker_uninstalled_gsettings_schema_dir)
 testconf.set('TEST_ONTOLOGIES_DIR', tracker_uninstalled_nepomuk_ontologies_dir)
 testconf.set('TEST_LANGUAGE_STOP_WORDS_DIR', tracker_uninstalled_stop_words_dir)
 
diff --git a/tests/meson.build b/tests/meson.build
index 33f6e6987..63740eee6 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -39,7 +39,6 @@ foreach t: tests
   test_requires_dbus = t.get('requires_dbus', false)
 
   test_env = environment()
-  test_env.set('GSETTINGS_SCHEMA_DIR', join_paths(build_root, 'data'))
   test_env.set('TRACKER_LANGUAGE_STOP_WORDS_DIR', join_paths(source_root, 'src', 'libtracker-common', 
'stop-words'))
   test_env.set('TRACKER_TEST_DOMAIN_ONTOLOGY_RULE', join_paths(source_root, 'src', 'tracker-store', 
'default.rule'))
   test_env.set('TRACKER_DB_ONTOLOGIES_DIR', join_paths(source_root, 'src', 'ontologies', 'nepomuk'))


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]