lib-fts: Rename to lib-language

This is just replacing the path not internal library name yet.

diff --git a/.gitignore b/.gitignore
index 1a7e7bc3df9e8dc11c5daaae24dcda9a7099d704..4f20b1a366a5ad868f96fbec5577d1229931bf63 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -100,10 +100,10 @@ src/lib/event-filter-parser.h
 src/lib/unicodemap.c
 src/lib/UnicodeData.txt
 src/lib-compression/bench-compression
-src/lib-fts/PropList.txt
-src/lib-fts/WordBreakProperty.txt
-src/lib-fts/word-boundary-data.c
-src/lib-fts/word-break-data.c
+src/lib-language/PropList.txt
+src/lib-language/WordBreakProperty.txt
+src/lib-language/word-boundary-data.c
+src/lib-language/word-break-data.c
 src/lib-dict-backend/dict-drivers-register.c
 src/lib-json/json-format
 src/lib-sql/sql-drivers-register.c

diff --git a/configure.ac b/configure.ac
index b65ce37059ca0653c7b03263fea4b14c62a4f25d..1a0755a8c64a3998fc5708291a532acf0339ff7c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -610,7 +610,7 @@ LIBDOVECOT_STORAGE="$LIBDOVECOT_STORAGE_DEPS"
 LIBDOVECOT_DSYNC='$(top_builddir)/src/doveadm/dsync/libdovecot-dsync.la'
 LIBDOVECOT_SQL='$(top_builddir)/src/lib-sql/libsql.la'
 LIBDOVECOT_COMPRESS='$(top_builddir)/src/lib-compression/libcompression.la'
-LIBDOVECOT_LIBFTS='$(top_builddir)/src/lib-fts/libfts.la'
+LIBDOVECOT_LIBFTS='$(top_builddir)/src/lib-language/libfts.la'
 
 LIBDOVECOT_OPENSSL='$(top_builddir)/src/lib-ssl-iostream/libssl_iostream_openssl.la'
 LIBDOVECOT_OPENSSL_DEPS="$LIBDOVECOT_OPENSSL"
@@ -819,7 +819,7 @@ src/lib-dict-extra/Makefile
 src/lib-dns/Makefile
 src/lib-doveadm/Makefile
 src/lib-fs/Makefile
-src/lib-fts/Makefile
+src/lib-language/Makefile
 src/lib-http/Makefile
 src/lib-oauth2/Makefile
 src/lib-pop3/Makefile

diff --git a/dovecot-config.in.in b/dovecot-config.in.in
index ee48b7b066f216ffd48f2ee56bb05b649d044e4d..194c3a267e042fd190b64dede531b0abccb96225 100644 (file)
--- a/dovecot-config.in.in
+++ b/dovecot-config.in.in
@@ -52,7 +52,7 @@ LIBDOVECOT_FTS_INCLUDE="-I$(incdir)/src/plugins/fts"
 LIBDOVECOT_NOTIFY_INCLUDE="-I$(incdir)/src/plugins/notify"
 LIBDOVECOT_PUSH_NOTIFICATION_INCLUDE="-I$(incdir)/src/plugins/push-notification"
 LIBDOVECOT_ACL_INCLUDE="-I$(incdir)/src/plugins/acl"
-LIBDOVECOT_LIBFTS_INCLUDE="-I$(incdir)/src/lib-fts"
+LIBDOVECOT_LIBFTS_INCLUDE="-I$(incdir)/src/lib-language"
 LIBDOVECOT_LUA_INCLUDE="-I$(incdir)/src/lib-lua"
 
 dovecot_pkgincludedir=

diff --git a/src/Makefile.am b/src/Makefile.am
index e47cc067241a3f453c2975986a4df905c7f7b199..f4999c50a4ea0b6e8b495f3bfa9d0d92a39c1fab 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,7 +41,7 @@ SUBDIRS = \
        lib-dovecot \
        $(LIB_LDAP) \
        $(LIB_LUA) \
-       lib-fts \
+       lib-language \
        lib-imap-client \
        lib-imap-urlauth \
        lib-compression \

diff --git a/src/indexer/Makefile.am b/src/indexer/Makefile.am
index 5dd02c96b91b9dcc7399e284c50b1fa5de9f21e9..d455ea6b20b6c34024d2066cf7b9332294f57305 100644 (file)
--- a/src/indexer/Makefile.am
+++ b/src/indexer/Makefile.am
@@ -10,7 +10,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib-mail \
        -I$(top_srcdir)/src/lib-index \
        -I$(top_srcdir)/src/lib-storage \
-       -I$(top_srcdir)/src/lib-fts \
+       -I$(top_srcdir)/src/lib-language \
        -DPKG_RUNDIR=\""$(rundir)"\" \
        $(BINARY_CFLAGS)
 

diff --git a/src/lib-dcrypt/test-stream.c b/src/lib-dcrypt/test-stream.c
index f392985cef592326ea067fe19f479807711fc6a0..6d13c62df7949a460f1f0cde10a9e1e360bd7cc6 100644 (file)
--- a/src/lib-dcrypt/test-stream.c
+++ b/src/lib-dcrypt/test-stream.c
@@ -183,7 +183,7 @@ static void test_static_v2_input(void)
 
 /** this code is left here to show how the sample file is created
        struct istream *is =
-               i_stream_create_file("../lib-fts/udhr_fra.txt", 8192);
+               i_stream_create_file("../lib-language/udhr_fra.txt", 8192);
        struct istream *is_2 = i_stream_create_hash(is, hash, hash_ctx);
        int fd = open("sample-v2.bin", O_CREAT|O_TRUNC|O_WRONLY, S_IRWXU);
        struct ostream *os = o_stream_create_fd_file(fd, 0, TRUE);

diff --git a/src/lib-fts/Makefile.am b/src/lib-language/Makefile.am
similarity index 95%
rename from src/lib-fts/Makefile.am
rename to src/lib-language/Makefile.am
index 8fd04fb5d0f34c4b06e9d31d752c624059b749ef..fbe1c1bf9715be3446830d5112d02458b2242b6e 100644 (file)
--- a/src/lib-fts/Makefile.am
+++ b/src/lib-language/Makefile.am
@@ -1,18 +1,18 @@
 noinst_LTLIBRARIES = libfts.la
 
-# I$(top_srcdir)/src/lib-fts needed to include
+# I$(top_srcdir)/src/lib-language needed to include
 # word-break-data.c and word-boundary-data.c
 # in fts-tokenizer-generic.c
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-test \
        -I$(top_srcdir)/src/lib-mail \
-       -I$(top_srcdir)/src/lib-fts \
+       -I$(top_srcdir)/src/lib-language \
        $(LIBEXTTEXTCAT_CFLAGS) \
        $(LIBICU_CFLAGS) \
-       -DUDHRDIR=\""$(top_srcdir)/src/lib-fts"\" \
+       -DUDHRDIR=\""$(top_srcdir)/src/lib-language"\" \
        -DDATADIR=\"$(pkgdatadir)\" \
-       -DTEST_STOPWORDS_DIR=\""$(top_srcdir)/src/lib-fts/stopwords"\"
+       -DTEST_STOPWORDS_DIR=\""$(top_srcdir)/src/lib-language/stopwords"\"
 
 stopwordsdir = $(datadir)/${PACKAGE_TARNAME}/stopwords
 dist_stopwords_DATA = \

diff --git a/src/lib-fts/fts-common.h b/src/lib-language/fts-common.h
similarity index 100%
rename from src/lib-fts/fts-common.h
rename to src/lib-language/fts-common.h

diff --git a/src/lib-fts/fts-filter-common.c b/src/lib-language/fts-filter-common.c
similarity index 100%
rename from src/lib-fts/fts-filter-common.c
rename to src/lib-language/fts-filter-common.c

diff --git a/src/lib-fts/fts-filter-common.h b/src/lib-language/fts-filter-common.h
similarity index 100%
rename from src/lib-fts/fts-filter-common.h
rename to src/lib-language/fts-filter-common.h

diff --git a/src/lib-fts/fts-filter-contractions.c b/src/lib-language/fts-filter-contractions.c
similarity index 100%
rename from src/lib-fts/fts-filter-contractions.c
rename to src/lib-language/fts-filter-contractions.c

diff --git a/src/lib-fts/fts-filter-english-possessive.c b/src/lib-language/fts-filter-english-possessive.c
similarity index 100%
rename from src/lib-fts/fts-filter-english-possessive.c
rename to src/lib-language/fts-filter-english-possessive.c

diff --git a/src/lib-fts/fts-filter-lowercase.c b/src/lib-language/fts-filter-lowercase.c
similarity index 100%
rename from src/lib-fts/fts-filter-lowercase.c
rename to src/lib-language/fts-filter-lowercase.c

diff --git a/src/lib-fts/fts-filter-normalizer-icu.c b/src/lib-language/fts-filter-normalizer-icu.c
similarity index 100%
rename from src/lib-fts/fts-filter-normalizer-icu.c
rename to src/lib-language/fts-filter-normalizer-icu.c

diff --git a/src/lib-fts/fts-filter-private.h b/src/lib-language/fts-filter-private.h
similarity index 100%
rename from src/lib-fts/fts-filter-private.h
rename to src/lib-language/fts-filter-private.h

diff --git a/src/lib-fts/fts-filter-stemmer-snowball.c b/src/lib-language/fts-filter-stemmer-snowball.c
similarity index 100%
rename from src/lib-fts/fts-filter-stemmer-snowball.c
rename to src/lib-language/fts-filter-stemmer-snowball.c

diff --git a/src/lib-fts/fts-filter-stopwords.c b/src/lib-language/fts-filter-stopwords.c
similarity index 100%
rename from src/lib-fts/fts-filter-stopwords.c
rename to src/lib-language/fts-filter-stopwords.c

diff --git a/src/lib-fts/fts-filter.c b/src/lib-language/fts-filter.c
similarity index 100%
rename from src/lib-fts/fts-filter.c
rename to src/lib-language/fts-filter.c

diff --git a/src/lib-fts/fts-filter.h b/src/lib-language/fts-filter.h
similarity index 100%
rename from src/lib-fts/fts-filter.h
rename to src/lib-language/fts-filter.h

diff --git a/src/lib-fts/fts-icu.c b/src/lib-language/fts-icu.c
similarity index 100%
rename from src/lib-fts/fts-icu.c
rename to src/lib-language/fts-icu.c

diff --git a/src/lib-fts/fts-icu.h b/src/lib-language/fts-icu.h
similarity index 100%
rename from src/lib-fts/fts-icu.h
rename to src/lib-language/fts-icu.h

diff --git a/src/lib-fts/fts-indexer-status.h b/src/lib-language/fts-indexer-status.h
similarity index 100%
rename from src/lib-fts/fts-indexer-status.h
rename to src/lib-language/fts-indexer-status.h

diff --git a/src/lib-fts/fts-language.c b/src/lib-language/fts-language.c
similarity index 100%
rename from src/lib-fts/fts-language.c
rename to src/lib-language/fts-language.c

diff --git a/src/lib-fts/fts-language.h b/src/lib-language/fts-language.h
similarity index 100%
rename from src/lib-fts/fts-language.h
rename to src/lib-language/fts-language.h

diff --git a/src/lib-fts/fts-library.c b/src/lib-language/fts-library.c
similarity index 100%
rename from src/lib-fts/fts-library.c
rename to src/lib-language/fts-library.c

diff --git a/src/lib-fts/fts-library.h b/src/lib-language/fts-library.h
similarity index 100%
rename from src/lib-fts/fts-library.h
rename to src/lib-language/fts-library.h

diff --git a/src/lib-fts/fts-tokenizer-address.c b/src/lib-language/fts-tokenizer-address.c
similarity index 100%
rename from src/lib-fts/fts-tokenizer-address.c
rename to src/lib-language/fts-tokenizer-address.c

diff --git a/src/lib-fts/fts-tokenizer-common.c b/src/lib-language/fts-tokenizer-common.c
similarity index 100%
rename from src/lib-fts/fts-tokenizer-common.c
rename to src/lib-language/fts-tokenizer-common.c

diff --git a/src/lib-fts/fts-tokenizer-common.h b/src/lib-language/fts-tokenizer-common.h
similarity index 100%
rename from src/lib-fts/fts-tokenizer-common.h
rename to src/lib-language/fts-tokenizer-common.h

diff --git a/src/lib-fts/fts-tokenizer-generic-private.h b/src/lib-language/fts-tokenizer-generic-private.h
similarity index 100%
rename from src/lib-fts/fts-tokenizer-generic-private.h
rename to src/lib-language/fts-tokenizer-generic-private.h

diff --git a/src/lib-fts/fts-tokenizer-generic.c b/src/lib-language/fts-tokenizer-generic.c
similarity index 100%
rename from src/lib-fts/fts-tokenizer-generic.c
rename to src/lib-language/fts-tokenizer-generic.c

diff --git a/src/lib-fts/fts-tokenizer-private.h b/src/lib-language/fts-tokenizer-private.h
similarity index 100%
rename from src/lib-fts/fts-tokenizer-private.h
rename to src/lib-language/fts-tokenizer-private.h

diff --git a/src/lib-fts/fts-tokenizer.c b/src/lib-language/fts-tokenizer.c
similarity index 100%
rename from src/lib-fts/fts-tokenizer.c
rename to src/lib-language/fts-tokenizer.c

diff --git a/src/lib-fts/fts-tokenizer.h b/src/lib-language/fts-tokenizer.h
similarity index 100%
rename from src/lib-fts/fts-tokenizer.h
rename to src/lib-language/fts-tokenizer.h

diff --git a/src/lib-fts/stopwords/stopwords_da.txt b/src/lib-language/stopwords/stopwords_da.txt
similarity index 100%
rename from src/lib-fts/stopwords/stopwords_da.txt
rename to src/lib-language/stopwords/stopwords_da.txt

diff --git a/src/lib-fts/stopwords/stopwords_de.txt b/src/lib-language/stopwords/stopwords_de.txt
similarity index 100%
rename from src/lib-fts/stopwords/stopwords_de.txt
rename to src/lib-language/stopwords/stopwords_de.txt

diff --git a/src/lib-fts/stopwords/stopwords_en.txt b/src/lib-language/stopwords/stopwords_en.txt
similarity index 100%
rename from src/lib-fts/stopwords/stopwords_en.txt
rename to src/lib-language/stopwords/stopwords_en.txt

diff --git a/src/lib-fts/stopwords/stopwords_es.txt b/src/lib-language/stopwords/stopwords_es.txt
similarity index 100%
rename from src/lib-fts/stopwords/stopwords_es.txt
rename to src/lib-language/stopwords/stopwords_es.txt

diff --git a/src/lib-fts/stopwords/stopwords_fi.txt b/src/lib-language/stopwords/stopwords_fi.txt
similarity index 100%
rename from src/lib-fts/stopwords/stopwords_fi.txt
rename to src/lib-language/stopwords/stopwords_fi.txt

diff --git a/src/lib-fts/stopwords/stopwords_fr.txt b/src/lib-language/stopwords/stopwords_fr.txt
similarity index 100%
rename from src/lib-fts/stopwords/stopwords_fr.txt
rename to src/lib-language/stopwords/stopwords_fr.txt

diff --git a/src/lib-fts/stopwords/stopwords_it.txt b/src/lib-language/stopwords/stopwords_it.txt
similarity index 100%
rename from src/lib-fts/stopwords/stopwords_it.txt
rename to src/lib-language/stopwords/stopwords_it.txt

diff --git a/src/lib-fts/stopwords/stopwords_malformed.txt b/src/lib-language/stopwords/stopwords_malformed.txt
similarity index 100%
rename from src/lib-fts/stopwords/stopwords_malformed.txt
rename to src/lib-language/stopwords/stopwords_malformed.txt

diff --git a/src/lib-fts/stopwords/stopwords_nl.txt b/src/lib-language/stopwords/stopwords_nl.txt
similarity index 100%
rename from src/lib-fts/stopwords/stopwords_nl.txt
rename to src/lib-language/stopwords/stopwords_nl.txt

diff --git a/src/lib-fts/stopwords/stopwords_no.txt b/src/lib-language/stopwords/stopwords_no.txt
similarity index 100%
rename from src/lib-fts/stopwords/stopwords_no.txt
rename to src/lib-language/stopwords/stopwords_no.txt

diff --git a/src/lib-fts/stopwords/stopwords_pt.txt b/src/lib-language/stopwords/stopwords_pt.txt
similarity index 100%
rename from src/lib-fts/stopwords/stopwords_pt.txt
rename to src/lib-language/stopwords/stopwords_pt.txt

diff --git a/src/lib-fts/stopwords/stopwords_ro.txt b/src/lib-language/stopwords/stopwords_ro.txt
similarity index 100%
rename from src/lib-fts/stopwords/stopwords_ro.txt
rename to src/lib-language/stopwords/stopwords_ro.txt

diff --git a/src/lib-fts/stopwords/stopwords_ru.txt b/src/lib-language/stopwords/stopwords_ru.txt
similarity index 100%
rename from src/lib-fts/stopwords/stopwords_ru.txt
rename to src/lib-language/stopwords/stopwords_ru.txt

diff --git a/src/lib-fts/stopwords/stopwords_sv.txt b/src/lib-language/stopwords/stopwords_sv.txt
similarity index 100%
rename from src/lib-fts/stopwords/stopwords_sv.txt
rename to src/lib-language/stopwords/stopwords_sv.txt

diff --git a/src/lib-fts/stopwords/stopwords_tr.txt b/src/lib-language/stopwords/stopwords_tr.txt
similarity index 100%
rename from src/lib-fts/stopwords/stopwords_tr.txt
rename to src/lib-language/stopwords/stopwords_tr.txt

diff --git a/src/lib-fts/test-fts-filter.c b/src/lib-language/test-fts-filter.c
similarity index 100%
rename from src/lib-fts/test-fts-filter.c
rename to src/lib-language/test-fts-filter.c

diff --git a/src/lib-fts/test-fts-icu.c b/src/lib-language/test-fts-icu.c
similarity index 100%
rename from src/lib-fts/test-fts-icu.c
rename to src/lib-language/test-fts-icu.c

diff --git a/src/lib-fts/test-fts-language.c b/src/lib-language/test-fts-language.c
similarity index 100%
rename from src/lib-fts/test-fts-language.c
rename to src/lib-language/test-fts-language.c

diff --git a/src/lib-fts/test-fts-tokenizer.c b/src/lib-language/test-fts-tokenizer.c
similarity index 100%
rename from src/lib-fts/test-fts-tokenizer.c
rename to src/lib-language/test-fts-tokenizer.c

diff --git a/src/lib-fts/udhr_fra.txt b/src/lib-language/udhr_fra.txt
similarity index 100%
rename from src/lib-fts/udhr_fra.txt
rename to src/lib-language/udhr_fra.txt

diff --git a/src/lib-fts/word-properties.pl b/src/lib-language/word-properties.pl
similarity index 100%
rename from src/lib-fts/word-properties.pl
rename to src/lib-language/word-properties.pl

diff --git a/src/plugins/fts/Makefile.am b/src/plugins/fts/Makefile.am
index d5ddb2c8e7db0fbcb413748e53d1f932dc8f4c01..2d25d92c95fee57eb5a50dc152159aff9d8eab4c 100644 (file)
--- a/src/plugins/fts/Makefile.am
+++ b/src/plugins/fts/Makefile.am
@@ -4,7 +4,7 @@ doveadm_moduledir = $(moduledir)/doveadm
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-settings \
-       -I$(top_srcdir)/src/lib-fts \
+       -I$(top_srcdir)/src/lib-language \
        -I$(top_srcdir)/src/lib-ssl-iostream \
        -I$(top_srcdir)/src/lib-http \
        -I$(top_srcdir)/src/lib-mail \
@@ -22,7 +22,7 @@ lib20_fts_plugin_la_LDFLAGS = -module -avoid-version
 module_LTLIBRARIES = \
        lib20_fts_plugin.la
 
-lib20_fts_plugin_la_LIBADD = ../../lib-fts/libfts.la
+lib20_fts_plugin_la_LIBADD = ../../lib-language/libfts.la
 
 lib20_fts_plugin_la_SOURCES = \
        fts-api.c \