GNOME.org
 

[tracker/data-in-binary-dirs: 6/13] data: Moved data/languages to src/libtracker-common/stop-words

commit 6ef34ac5314f63600b5fb19aac9065c7d576617d
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Sep 25 17:02:53 2014 +0100

    data: Moved data/languages to src/libtracker-common/stop-words
    
    Only API in libtracker-common uses these

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    2 +-
 data/languages/Makefile.am                         |   18 ------------------
 src/libtracker-common/Makefile.am                  |    2 ++
 src/libtracker-common/stop-words/Makefile.am       |   17 +++++++++++++++++
 .../libtracker-common/stop-words}/stopwords.da     |    0
 .../libtracker-common/stop-words}/stopwords.de     |    0
 .../libtracker-common/stop-words}/stopwords.en     |    0
 .../libtracker-common/stop-words}/stopwords.es     |    0
 .../libtracker-common/stop-words}/stopwords.fi     |    0
 .../libtracker-common/stop-words}/stopwords.fr     |    0
 .../libtracker-common/stop-words}/stopwords.hu     |    0
 .../libtracker-common/stop-words}/stopwords.it     |    0
 .../libtracker-common/stop-words}/stopwords.nb     |    0
 .../libtracker-common/stop-words}/stopwords.nl     |    0
 .../libtracker-common/stop-words}/stopwords.pt     |    0
 .../libtracker-common/stop-words}/stopwords.ru     |    0
 .../libtracker-common/stop-words}/stopwords.sv     |    0
 src/libtracker-common/tracker-language.c           |    2 +-
 tests/functional-tests/310-fts-indexing.py         |    2 +-
 tests/functional-tests/fts-tc.py                   |    2 +-
 tests/libtracker-fts/tracker-parser-test.c         |    2 +-
 utils/sandbox/tracker-sandbox.py                   |    2 +-
 23 files changed, 26 insertions(+), 25 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index fc6afe7..e35104a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2557,7 +2557,6 @@ AM_CONDITIONAL(HAVE_ARTWORK, test "x$have_artwork" = "xyes")
 
 AC_CONFIG_FILES([
        data/gschemas/Makefile
-       data/languages/Makefile
        data/Makefile
        data/miners/Makefile
        docs/Makefile
@@ -2577,6 +2576,7 @@ AC_CONFIG_FILES([
        po/Makefile.in
        src/gvdb/Makefile
        src/libtracker-common/Makefile
+       src/libtracker-common/stop-words/Makefile
        src/libtracker-sparql/Makefile
        src/libtracker-sparql/tracker-sparql.pc
        src/libtracker-bus/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index aa3f18c..1c1b51a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1 +1 @@
-SUBDIRS = languages miners gschemas
+SUBDIRS = miners gschemas
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index fb7941d..d2660a0 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = stop-words
+
 AM_CPPFLAGS = \
        $(BUILD_CFLAGS) \
        -I$(top_srcdir)/src \
diff --git a/src/libtracker-common/stop-words/Makefile.am b/src/libtracker-common/stop-words/Makefile.am
new file mode 100644
index 0000000..745df23
--- /dev/null
+++ b/src/libtracker-common/stop-words/Makefile.am
@@ -0,0 +1,17 @@
+configdir = $(datadir)/tracker/stop-words
+config_DATA = \
+       stopwords.da \
+       stopwords.de \
+       stopwords.en \
+       stopwords.es \
+       stopwords.fi \
+       stopwords.fr \
+       stopwords.hu \
+       stopwords.it \
+       stopwords.nb \
+       stopwords.nl \
+       stopwords.pt \
+       stopwords.ru \
+       stopwords.sv
+
+EXTRA_DIST = $(config_DATA)
diff --git a/data/languages/stopwords.da b/src/libtracker-common/stop-words/stopwords.da
similarity index 100%
rename from data/languages/stopwords.da
rename to src/libtracker-common/stop-words/stopwords.da
diff --git a/data/languages/stopwords.de b/src/libtracker-common/stop-words/stopwords.de
similarity index 100%
rename from data/languages/stopwords.de
rename to src/libtracker-common/stop-words/stopwords.de
diff --git a/data/languages/stopwords.en b/src/libtracker-common/stop-words/stopwords.en
similarity index 100%
rename from data/languages/stopwords.en
rename to src/libtracker-common/stop-words/stopwords.en
diff --git a/data/languages/stopwords.es b/src/libtracker-common/stop-words/stopwords.es
similarity index 100%
rename from data/languages/stopwords.es
rename to src/libtracker-common/stop-words/stopwords.es
diff --git a/data/languages/stopwords.fi b/src/libtracker-common/stop-words/stopwords.fi
similarity index 100%
rename from data/languages/stopwords.fi
rename to src/libtracker-common/stop-words/stopwords.fi
diff --git a/data/languages/stopwords.fr b/src/libtracker-common/stop-words/stopwords.fr
similarity index 100%
rename from data/languages/stopwords.fr
rename to src/libtracker-common/stop-words/stopwords.fr
diff --git a/data/languages/stopwords.hu b/src/libtracker-common/stop-words/stopwords.hu
similarity index 100%
rename from data/languages/stopwords.hu
rename to src/libtracker-common/stop-words/stopwords.hu
diff --git a/data/languages/stopwords.it b/src/libtracker-common/stop-words/stopwords.it
similarity index 100%
rename from data/languages/stopwords.it
rename to src/libtracker-common/stop-words/stopwords.it
diff --git a/data/languages/stopwords.nb b/src/libtracker-common/stop-words/stopwords.nb
similarity index 100%
rename from data/languages/stopwords.nb
rename to src/libtracker-common/stop-words/stopwords.nb
diff --git a/data/languages/stopwords.nl b/src/libtracker-common/stop-words/stopwords.nl
similarity index 100%
rename from data/languages/stopwords.nl
rename to src/libtracker-common/stop-words/stopwords.nl
diff --git a/data/languages/stopwords.pt b/src/libtracker-common/stop-words/stopwords.pt
similarity index 100%
rename from data/languages/stopwords.pt
rename to src/libtracker-common/stop-words/stopwords.pt
diff --git a/data/languages/stopwords.ru b/src/libtracker-common/stop-words/stopwords.ru
similarity index 100%
rename from data/languages/stopwords.ru
rename to src/libtracker-common/stop-words/stopwords.ru
diff --git a/data/languages/stopwords.sv b/src/libtracker-common/stop-words/stopwords.sv
similarity index 100%
rename from data/languages/stopwords.sv
rename to src/libtracker-common/stop-words/stopwords.sv
diff --git a/src/libtracker-common/tracker-language.c b/src/libtracker-common/tracker-language.c
index 73096b2..cb8d717 100644
--- a/src/libtracker-common/tracker-language.c
+++ b/src/libtracker-common/tracker-language.c
@@ -235,7 +235,7 @@ language_get_stopword_filename (const gchar *language_code)
        if (!testpath) {
                filename = g_build_filename (SHAREDIR,
                                             "tracker",
-                                            "languages",
+                                            "stop-words",
                                             str,
                                             NULL);
        } else {
diff --git a/tests/functional-tests/310-fts-indexing.py b/tests/functional-tests/310-fts-indexing.py
index 99db45d..99152bb 100755
--- a/tests/functional-tests/310-fts-indexing.py
+++ b/tests/functional-tests/310-fts-indexing.py
@@ -288,7 +288,7 @@ class MinerFTSStopwordsTest (CommonMinerFTS):
         if "_" in langcode:
             langcode = langcode.split ("_")[0]
 
-        stopwordsfile = os.path.join (cfg.DATADIR, "tracker", "languages", "stopwords." + langcode)
+        stopwordsfile = os.path.join (cfg.DATADIR, "tracker", "stop-words", "stopwords." + langcode)
 
         if not os.path.exists (stopwordsfile):
             self.skipTest ("No stopwords for the current locale ('%s' doesn't exist)" % (stopwordsfile))
diff --git a/tests/functional-tests/fts-tc.py b/tests/functional-tests/fts-tc.py
index 1c5686d..620802b 100644
--- a/tests/functional-tests/fts-tc.py
+++ b/tests/functional-tests/fts-tc.py
@@ -469,7 +469,7 @@ class stopwords (TestUpdate):
        file_path =  configuration.MYDOCS + TEST_TEXT                   
                                                                         
         """copy the test files """                                      
-       test_file='/usr/share/tracker/languages/stopwords.en'
+       test_file='/usr/share/tracker/stop-words/stopwords.en'
        f1=open(test_file,'r')
        lines = f1.readlines()
        f1.close()
diff --git a/tests/libtracker-fts/tracker-parser-test.c b/tests/libtracker-fts/tracker-parser-test.c
index 50e3402..7596742 100644
--- a/tests/libtracker-fts/tracker-parser-test.c
+++ b/tests/libtracker-fts/tracker-parser-test.c
@@ -359,7 +359,7 @@ main (int argc, char **argv)
         *  need to set the following envvar with the path where the
         *  dictionaries are. */
        g_setenv ("TRACKER_LANGUAGE_STOP_WORDS_DIR",
-                 TOP_SRCDIR "/data/languages",
+                 TOP_SRCDIR "/src/libtracker-common/stop-words",
                  TRUE);
 
        /* Add normalization checks */
diff --git a/utils/sandbox/tracker-sandbox.py b/utils/sandbox/tracker-sandbox.py
index de8d9f6..7018432 100755
--- a/utils/sandbox/tracker-sandbox.py
+++ b/utils/sandbox/tracker-sandbox.py
@@ -349,7 +349,7 @@ def environment_set():
 
                os.environ['TRACKER_DB_ONTOLOGIES_DIR'] = os.path.join(opts.prefix, 'share', 'tracker', 
'ontologies')
                os.environ['TRACKER_EXTRACTOR_RULES_DIR'] = os.path.join(opts.prefix, 'share', 'tracker', 
'extract-rules')
-               os.environ['TRACKER_LANGUAGE_STOPWORDS_DIR'] = os.path.join(opts.prefix, 'share', 'tracker', 
'languages')
+               os.environ['TRACKER_LANGUAGE_STOPWORDS_DIR'] = os.path.join(opts.prefix, 'share', 'tracker', 
'stop-words')
 
        # Preferences
        os.environ['TRACKER_USE_CONFIG_FILES'] = 'yes'
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]