Add a script to combine all fts5 code into a single file - fts5.c - that can be used...

FossilOrigin-Name: 46e86b0637248fb4d623c97778cc041eabe3636c

diff --git a/Makefile.in b/Makefile.in
index 91bed0626183de5dd0a9e23663d597093addbd17..a4c585c7cd87230c4c94121bee345f63a04fd213 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -352,7 +352,7 @@ SRC += \
    $(TOP)/ext/fts5/fts5Int.h \
    $(TOP)/ext/fts5/fts5_aux.c \
    $(TOP)/ext/fts5/fts5_buffer.c \
-   $(TOP)/ext/fts5/fts5.c \
+   $(TOP)/ext/fts5/fts5_main.c \
    $(TOP)/ext/fts5/fts5_config.c \
    $(TOP)/ext/fts5/fts5_expr.c \
    $(TOP)/ext/fts5/fts5_hash.c \

diff --git a/ext/fts5/fts5Int.h b/ext/fts5/fts5Int.h
index eef36f811eaef37cde9a37b6f58002c750f15b0e..07d1e4fecb29bcad51bd00ead0358e941c77e075 100644 (file)
--- a/ext/fts5/fts5Int.h
+++ b/ext/fts5/fts5Int.h
@@ -14,7 +14,11 @@
 #ifndef _FTS5INT_H
 #define _FTS5INT_H
 
+#ifdef SQLITE_ENABLE_FTS5
+
 #include "fts5.h"
+#include "sqlite3ext.h"
+SQLITE_EXTENSION_INIT1
 
 #include <string.h>
 #include <assert.h>
@@ -689,3 +693,4 @@ int sqlite3Fts5UnicodeFold(int c, int bRemoveDiacritic);
 **************************************************************************/
 
 #endif
+#endif

diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c
index dee9cd7ef3d7e9e48971d598cff58cc2184c8511..ec930f1a3ba72651aae7e48694ff5ecf24e8c72e 100644 (file)
--- a/ext/fts5/fts5_index.c
+++ b/ext/fts5/fts5_index.c
@@ -4273,7 +4273,7 @@ static int fts5IndexCharlenToBytelen(const char *p, int nByte, int nChar){
 ** pIn is a UTF-8 encoded string, nIn bytes in size. Return the number of
 ** unicode characters in the string.
 */
-int fts5IndexCharlen(const char *pIn, int nIn){
+static int fts5IndexCharlen(const char *pIn, int nIn){
   int nChar = 0;            
   int i = 0;
   while( i<nIn ){

diff --git a/ext/fts5/fts5.c b/ext/fts5/fts5_main.c
similarity index 99%
rename from ext/fts5/fts5.c
rename to ext/fts5/fts5_main.c
index a851909094be55bdf1a62b9bff4603e0e9e431ce..3b8241f132caef0689ae99dbf6d49cdc5bc54022 100644 (file)
--- a/ext/fts5/fts5.c
+++ b/ext/fts5/fts5_main.c
@@ -18,12 +18,12 @@
 #include "fts5Int.h"
 
 /*
-** This variable is set to true when running corruption tests. Otherwise
-** false. If it is false, extra assert() conditions in the fts5 code are
-** activated - conditions that are only true if it is guaranteed that the
-** fts5 database is not corrupt.
+** This variable is set to false when running tests for which the on disk
+** structures should not be corrupt. Otherwise, true. If it is false, extra
+** assert() conditions in the fts5 code are activated - conditions that are
+** only true if it is guaranteed that the fts5 database is not corrupt.
 */
-int sqlite3_fts5_may_be_corrupt = 0;
+int sqlite3_fts5_may_be_corrupt = 1;
 
 
 typedef struct Fts5Table Fts5Table;
@@ -2224,7 +2224,14 @@ static void fts5Fts5Func(
   sqlite3_result_blob(pCtx, buf, sizeof(pGlobal), SQLITE_TRANSIENT);
 }
 
-int sqlite3Fts5Init(sqlite3 *db){
+#ifdef _WIN32_
+__declspec(dllexport)
+#endif
+int sqlite3_fts5_init(
+  sqlite3 *db,
+  char **pzErrMsg,
+  const sqlite3_api_routines *pApi
+){
   static const sqlite3_module fts5Mod = {
     /* iVersion      */ 2,
     /* xCreate       */ fts5CreateMethod,
@@ -2253,8 +2260,10 @@ int sqlite3Fts5Init(sqlite3 *db){
 
   int rc;
   Fts5Global *pGlobal = 0;
-  pGlobal = (Fts5Global*)sqlite3_malloc(sizeof(Fts5Global));
 
+  SQLITE_EXTENSION_INIT2(pApi);
+
+  pGlobal = (Fts5Global*)sqlite3_malloc(sizeof(Fts5Global));
   if( pGlobal==0 ){
     rc = SQLITE_NOMEM;
   }else{

diff --git a/ext/fts5/test/fts5_common.tcl b/ext/fts5/test/fts5_common.tcl
index 78e45f80727c18a08bbaf678b2d4a3aaaffc53d9..06309e2163dae30b74ff088337a6705b6c3ce08c 100644 (file)
--- a/ext/fts5/test/fts5_common.tcl
+++ b/ext/fts5/test/fts5_common.tcl
@@ -15,6 +15,7 @@ if {![info exists testdir]} {
 }
 source $testdir/tester.tcl
 
+catch { sqlite3_fts5_may_be_corrupt 0 }
 
 proc fts5_test_poslist {cmd} {
   set res [list]

diff --git a/ext/fts5/tool/mkfts5c.tcl b/ext/fts5/tool/mkfts5c.tcl
new file mode 100644 (file)
index 0000000..eb287cb
--- /dev/null
+++ b/ext/fts5/tool/mkfts5c.tcl
@@ -0,0 +1,78 @@
+#!/bin/sh
+# restart with tclsh \
+exec tclsh "$0" "$@"
+
+set srcdir [file dirname [file dirname [info script]]]
+set G(src) [string map [list %dir% $srcdir] {
+  %dir%/fts5.h
+  %dir%/fts5Int.h
+  fts5parse.h
+  %dir%/fts5_aux.c
+  %dir%/fts5_buffer.c
+  %dir%/fts5_config.c
+  %dir%/fts5_expr.c
+  %dir%/fts5_hash.c
+  %dir%/fts5_index.c
+  %dir%/fts5_main.c
+  %dir%/fts5_storage.c
+  %dir%/fts5_tokenize.c
+  %dir%/fts5_unicode2.c
+  %dir%/fts5_varint.c
+  %dir%/fts5_vocab.c
+  fts5parse.c
+}]
+
+set G(hdr) {
+
+#if !defined(NDEBUG) && !defined(SQLITE_DEBUG) 
+# define NDEBUG 1
+#endif
+#if defined(NDEBUG) && defined(SQLITE_DEBUG)
+# undef NDEBUG
+#endif
+
+}
+
+proc readfile {zFile} {
+  set fd [open $zFile]
+  set data [read $fd]
+  close $fd
+  return $data
+}
+
+proc fts5c_init {zOut} {
+  global G
+  set G(fd) stdout
+  set G(fd) [open $zOut w]
+
+  puts -nonewline $G(fd) $G(hdr)
+}
+
+proc fts5c_printfile {zIn} {
+  global G
+  set data [readfile $zIn]
+  puts $G(fd) "#line 1 \"[file tail $zIn]\""
+  foreach line [split $data "\n"] {
+    if {[regexp {^#include.*fts5} $line]} continue
+    if {[regexp {^(const )?[a-zA-Z][a-zA-Z0-9]* [*]?sqlite3Fts5} $line]} {
+      set line "static $line"
+    }
+    puts $G(fd) $line
+  }
+}
+
+proc fts5c_close {} {
+  global G
+  if {$G(fd)!="stdout"} {
+    close $G(fd)
+  }
+}
+
+
+fts5c_init fts5.c
+foreach f $G(src) { fts5c_printfile $f }
+fts5c_close
+
+
+
+

diff --git a/main.mk b/main.mk
index 77357d00037726a5c2ea3ac52f0bccbc75a49af0..ed90e25575eb5442202987581c2a51c5693f3947 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -74,18 +74,6 @@ LIBOBJ+= vdbe.o parse.o \
          utf.o vtab.o
 
 LIBOBJ += fts5.o
-LIBOBJ += fts5_aux.o
-LIBOBJ += fts5_buffer.o
-LIBOBJ += fts5_config.o
-LIBOBJ += fts5_expr.o
-LIBOBJ += fts5_hash.o
-LIBOBJ += fts5_index.o
-LIBOBJ += fts5_storage.o
-LIBOBJ += fts5_tokenize.o
-LIBOBJ += fts5_unicode2.o
-LIBOBJ += fts5_varint.o
-LIBOBJ += fts5_vocab.o
-LIBOBJ += fts5parse.o
 
 
 
@@ -239,25 +227,11 @@ SRC += \
   $(TOP)/ext/rtree/rtree.c
 SRC += \
   $(TOP)/ext/userauth/userauth.c \
-  $(TOP)/ext/userauth/sqlite3userauth.h
+  $(TOP)/ext/userauth/sqlite3userauth.h 
+
 SRC += \
-   $(TOP)/ext/fts5/fts5.h \
-   $(TOP)/ext/fts5/fts5Int.h \
-   $(TOP)/ext/fts5/fts5_aux.c \
-   $(TOP)/ext/fts5/fts5_buffer.c \
-   $(TOP)/ext/fts5/fts5.c \
-   $(TOP)/ext/fts5/fts5_config.c \
-   $(TOP)/ext/fts5/fts5_expr.c \
-   $(TOP)/ext/fts5/fts5_hash.c \
-   $(TOP)/ext/fts5/fts5_index.c \
-   fts5parse.c fts5parse.h \
-   $(TOP)/ext/fts5/fts5_storage.c \
-   $(TOP)/ext/fts5/fts5_tokenize.c \
-   $(TOP)/ext/fts5/fts5_unicode2.c \
-   $(TOP)/ext/fts5/fts5_varint.c \
-   $(TOP)/ext/fts5/fts5_vocab.c  \
-   $(TOP)/ext/ota/sqlite3ota.c \
-   $(TOP)/ext/ota/sqlite3ota.h
+  $(TOP)/ext/ota/sqlite3ota.c \
+  $(TOP)/ext/ota/sqlite3ota.h
 
 
 # Generated source code files
@@ -663,41 +637,22 @@ rtree.o:  $(TOP)/ext/rtree/rtree.c $(HDR) $(EXTHDR)
 
 # FTS5 things
 #
-fts5.o:        $(TOP)/ext/fts5/fts5.c $(HDR) $(EXTHDR)
-       $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts5/fts5.c
-
-fts5_aux.o:    $(TOP)/ext/fts5/fts5_aux.c $(HDR) $(EXTHDR)
-       $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts5/fts5_aux.c
-
-fts5_buffer.o: $(TOP)/ext/fts5/fts5_buffer.c $(HDR) $(EXTHDR)
-       $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts5/fts5_buffer.c
-
-fts5_config.o: $(TOP)/ext/fts5/fts5_config.c $(HDR) $(EXTHDR)
-       $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts5/fts5_config.c
-
-fts5_expr.o:   $(TOP)/ext/fts5/fts5_expr.c $(HDR) $(EXTHDR)
-       $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts5/fts5_expr.c
-
-fts5_hash.o:   $(TOP)/ext/fts5/fts5_hash.c $(HDR) $(EXTHDR)
-       $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts5/fts5_hash.c
-
-fts5_index.o:  $(TOP)/ext/fts5/fts5_index.c $(HDR) $(EXTHDR)
-       $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts5/fts5_index.c
-
-fts5_storage.o:        $(TOP)/ext/fts5/fts5_storage.c $(HDR) $(EXTHDR)
-       $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts5/fts5_storage.c
-
-fts5_tokenize.o:       $(TOP)/ext/fts5/fts5_tokenize.c $(HDR) $(EXTHDR)
-       $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts5/fts5_tokenize.c
-
-fts5_unicode2.o:       $(TOP)/ext/fts5/fts5_unicode2.c $(HDR) $(EXTHDR)
-       $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts5/fts5_unicode2.c
-
-fts5_varint.o: $(TOP)/ext/fts5/fts5_varint.c $(HDR) $(EXTHDR)
-       $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts5/fts5_varint.c
-
-fts5_vocab.o:  $(TOP)/ext/fts5/fts5_vocab.c $(HDR) $(EXTHDR)
-       $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts5/fts5_vocab.c
+FTS5_SRC = \
+   $(TOP)/ext/fts5/fts5.h \
+   $(TOP)/ext/fts5/fts5Int.h \
+   $(TOP)/ext/fts5/fts5_aux.c \
+   $(TOP)/ext/fts5/fts5_buffer.c \
+   $(TOP)/ext/fts5/fts5_main.c \
+   $(TOP)/ext/fts5/fts5_config.c \
+   $(TOP)/ext/fts5/fts5_expr.c \
+   $(TOP)/ext/fts5/fts5_hash.c \
+   $(TOP)/ext/fts5/fts5_index.c \
+   fts5parse.c fts5parse.h \
+   $(TOP)/ext/fts5/fts5_storage.c \
+   $(TOP)/ext/fts5/fts5_tokenize.c \
+   $(TOP)/ext/fts5/fts5_unicode2.c \
+   $(TOP)/ext/fts5/fts5_varint.c \
+   $(TOP)/ext/fts5/fts5_vocab.c  \
 
 fts5parse.c:   $(TOP)/ext/fts5/fts5parse.y lemon 
        cp $(TOP)/ext/fts5/fts5parse.y .
@@ -711,6 +666,13 @@ fts5parse.c:       $(TOP)/ext/fts5/fts5parse.y lemon
 
 fts5parse.h: fts5parse.c
 
+fts5.c: $(FTS5_SRC)
+       tclsh $(TOP)/ext/fts5/tool/mkfts5c.tcl
+
+fts5.o:        fts5.c $(HDR) $(EXTHDR)
+       $(TCCX) -DSQLITE_CORE -c fts5.c
+
+
 
 userauth.o:    $(TOP)/ext/userauth/userauth.c $(HDR) $(EXTHDR)
        $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/userauth/userauth.c
@@ -747,9 +709,9 @@ testfixture$(EXE): $(TESTSRC2) libsqlite3.a $(TESTSRC) $(TOP)/src/tclsqlite.c
                $(TESTSRC) $(TESTSRC2) $(TOP)/src/tclsqlite.c                \
                -o testfixture$(EXE) $(LIBTCL) libsqlite3.a $(THREADLIB)
 
-amalgamation-testfixture$(EXE): sqlite3.c $(TESTSRC) $(TOP)/src/tclsqlite.c
+amalgamation-testfixture$(EXE): sqlite3.c fts5.c $(TESTSRC) $(TOP)/src/tclsqlite.c
        $(TCCX) $(TCL_FLAGS) -DTCLSH=1 $(TESTFIXTURE_FLAGS)                  \
-               $(TESTSRC) $(TOP)/src/tclsqlite.c sqlite3.c                  \
+               $(TESTSRC) $(TOP)/src/tclsqlite.c sqlite3.c fts5.c           \
                -o testfixture$(EXE) $(LIBTCL) $(THREADLIB)
 
 fts3-testfixture$(EXE): sqlite3.c fts3amal.c $(TESTSRC) $(TOP)/src/tclsqlite.c

diff --git a/manifest b/manifest
index adfbb0e1f534449e5d08e4d89c9c4fadc5aba0a6..2eaac48d9e8dabd9df024c1df0c0a53740fc9163 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,7 +1,7 @@
-C Improve\stest\scoverage\sof\sfts5.
-D 2015-06-23T18:47:55.733
+C Add\sa\sscript\sto\scombine\sall\sfts5\scode\sinto\sa\ssingle\sfile\s-\sfts5.c\s-\sthat\scan\sbe\sused\sto\sbuild\san\sSQLite\sloadable\sextension.
+D 2015-06-25T20:10:24.657
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in 6fa5a3c6f1f558bb443429e33806e2e494823e44
+F Makefile.in 4757ec5c89c420d90f18b0afa6e63d7b884c881d
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 F Makefile.msc b7db9ccbbad1c495b98e5326a06cac03aa206127
 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
@@ -105,15 +105,15 @@ F ext/fts3/unicode/UnicodeData.txt cd07314edb62d49fde34debdaf92fa2aa69011e7
 F ext/fts3/unicode/mkunicode.tcl ed0534dd51efce39878bce33944c6073d37a1e20
 F ext/fts3/unicode/parseunicode.tcl da577d1384810fb4e2b209bf3313074353193e95
 F ext/fts5/extract_api_docs.tcl 55a6d648d516f35d9a1e580ac00de27154e1904a
-F ext/fts5/fts5.c d7c58bd8c025a2202365194f2340930533f6ac24
 F ext/fts5/fts5.h 81d1a92fc2b4bd477af7e4e0b38b456f3e199fba
-F ext/fts5/fts5Int.h 21eb91e02ad119e1d92ff100f366a976e12190de
+F ext/fts5/fts5Int.h 41e9ed1f073770f660b1b59116357f504a8c5ff1
 F ext/fts5/fts5_aux.c d53f00f31ad615ca4f139dd8751f9041afa00971
 F ext/fts5/fts5_buffer.c be0dc80a9406151b350be27c7ec2956722578771
 F ext/fts5/fts5_config.c c232d181d6324f0ae3a2a31319924473999e5816
 F ext/fts5/fts5_expr.c 549bda1f7edcf10365fbfbc002bdea1be3c287bb
 F ext/fts5/fts5_hash.c c1cfdb2cae0fad00b06fae38a40eaf9261563ccc
-F ext/fts5/fts5_index.c 707bbc0c30e37748af69a5d1871ad2f59e5c5179
+F ext/fts5/fts5_index.c 438b245e9e44be3cfa848c71351a4e769b75876a
+F ext/fts5/fts5_main.c 35e90d3d8fafe4c936f232108e891d5f9a6294ca w ext/fts5/fts5.c
 F ext/fts5/fts5_storage.c b2fa301fce865d582d367a5e1bb438fe60c03cb5
 F ext/fts5/fts5_tcl.c 7ea165878e4ae3598e89acd470a0ee1b5a00e33c
 F ext/fts5/fts5_tokenize.c 97251d68d7a6a9415bde1203f9382864dfc1f989
@@ -122,7 +122,7 @@ F ext/fts5/fts5_varint.c 366452037bf9a000c351374b489badc1b3541796
 F ext/fts5/fts5_vocab.c e454fa58c6d591024659a9b61eece0d708e8b575
 F ext/fts5/fts5parse.y 833db1101b78c0c47686ab1b84918e38c36e9452
 F ext/fts5/mkportersteps.tcl 5acf962d2e0074f701620bb5308155fa1e4a63ba
-F ext/fts5/test/fts5_common.tcl 0b465b1127adcd1c8131f3454ab4264a6964674c
+F ext/fts5/test/fts5_common.tcl 26bab0c0ed684e95cd93c419ed995a3f83f4c258
 F ext/fts5/test/fts5aa.test 0be21c89fd66b588db355a6398911fd875bdcc6c
 F ext/fts5/test/fts5ab.test 6fe3a56731d15978afbb74ae51b355fc9310f2ad
 F ext/fts5/test/fts5ac.test 0990ae7497ebaea2ab5f7fd5caedd93a71a905fc
@@ -178,6 +178,7 @@ F ext/fts5/test/fts5unindexed.test f388605341a476b6ab622b4c267cd168f59a5944
 F ext/fts5/test/fts5version.test dc34a735af6625a1a7a4a916a38d122071343887
 F ext/fts5/test/fts5vocab.test 389e5fe4928eae5fddcf26bcc5a6890b0791aa75
 F ext/fts5/tool/loadfts5.tcl 7ef3e62131f0434a78e4f5c5b056b09d221710a8
+F ext/fts5/tool/mkfts5c.tcl fdb449263837a18d9131bc2f61b256fd77e64361
 F ext/fts5/tool/showfts5.tcl 921f33b30c3189deefd2b2cc81f951638544aaf1
 F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43
 F ext/icu/icu.c b2732aef0b076e4276d9b39b5a33cec7a05e1413
@@ -247,7 +248,7 @@ F ext/userauth/userauth.c 5fa3bdb492f481bbc1709fc83c91ebd13460c69e
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk 080c85fad8bf6532b7aeb782452b78e4440de346
+F main.mk d585680c45db1f68ec5ef88199fb10694d117e17
 F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
 F mkopcodeh.awk d5e22023b5238985bb54a72d33e0ac71fe4f8a32
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@ -291,7 +292,7 @@ F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
 F src/loadext.c e722f4b832f923744788365df5fb8515c0bc8a47
-F src/main.c fb40edfcda10062e4d1adab7f41635002e9b7e9d
+F src/main.c 37e3083001abc7a09de353186db990c2ee0ead80
 F src/malloc.c 908c780fdddd472163c2d1b1820ae4081f01ad20
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@ -1328,7 +1329,7 @@ F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
 F tool/mkpragmatab.tcl 40c287d3f929ece67da6e9e7c49885789960accf
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c-noext.tcl 69bae8ce4aa52d2ff82d4a8a856bf283ec035b2e
-F tool/mksqlite3c.tcl b601b174d783094edd926d913a8f545709e89f8a
+F tool/mksqlite3c.tcl d79e450048b0bbf04d53677e01c249a012981182
 F tool/mksqlite3h.tcl 44730d586c9031638cdd2eb443b801c0d2dbd9f8
 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
 F tool/mkvsix.tcl 3b58b9398f91c7dbf18d49eb87cefeee9efdbce1
@@ -1363,7 +1364,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P ef44c71a22518727030dd90c0139af8973b05841
-R 41ab20c81b8eca2b8b1f4493d7071c96
+P df5ccea80e8f0da83af5e595b539687006085120
+R 274e8476f9e52d5f62a7ac4e2d65cc10
 U dan
-Z 674a570e3df1810e4f64caae14985366
+Z 3dd1c662504ec180da9a3ceeda958cfb

diff --git a/manifest.uuid b/manifest.uuid
index a040de976557d9c34683512a8bccca52b60d7763..69235e7360ce9d73d118a1d593b397e3c7ca7545 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-df5ccea80e8f0da83af5e595b539687006085120
\ No newline at end of file
+46e86b0637248fb4d623c97778cc041eabe3636c
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index e7629ca9fa150a6e944a5beb5799e86824fd890a..711ca8f88550a03dbccc4a3a274df54c0519adbd 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -20,7 +20,7 @@
 # include "fts3.h"
 #endif
 #ifdef SQLITE_ENABLE_FTS5
-int sqlite3Fts5Init(sqlite3*);
+int sqlite3_fts5_init(sqlite3*, char**, const void*);
 #endif
 #ifdef SQLITE_ENABLE_RTREE
 # include "rtree.h"
@@ -2874,7 +2874,7 @@ static int openDatabase(
 
 #ifdef SQLITE_ENABLE_FTS5
   if( !db->mallocFailed && rc==SQLITE_OK ){
-    rc = sqlite3Fts5Init(db);
+    rc = sqlite3_fts5_init(db, 0, 0);
   }
 #endif
 

diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index 9f6699b9a6a1a798a2e501150873ea8615347d3e..5b003684277caa5074df1a458ff92563d2006720 100644 (file)
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -96,9 +96,6 @@ foreach hdr {
    fts3Int.h
    fts3_hash.h
    fts3_tokenizer.h
-   fts5.h
-   fts5Int.h
-   fts5parse.h
    hash.h
    hwtime.h
    keywordhash.h
@@ -372,20 +369,6 @@ foreach file {
    fts3_unicode.c
    fts3_unicode2.c
 
-   fts5_aux.c
-   fts5_buffer.c
-   fts5.c
-   fts5_config.c
-   fts5_expr.c
-   fts5_hash.c
-   fts5_index.c
-   fts5parse.c
-   fts5_storage.c
-   fts5_tokenize.c
-   fts5_unicode2.c
-   fts5_varint.c
-   fts5_vocab.c
-
    rtree.c
    icu.c
    fts3_icu.c