Trying to get FTS5 tests to build and run using main.mk. Not yet working.

FossilOrigin-Name: 206174f9b154c590a3e2e94236db38e111d64bdb

diff --git a/Makefile.in b/Makefile.in
index b66086417a02635ede353350d4c5b22ff2ff88b1..9d1020e070dcbcc36d5b7acb4050327f48bf6795 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -65,7 +65,7 @@ TCC += -DSQLITE_THREADSAFE=@SQLITE_THREADSAFE@
 
 # Any target libraries which libsqlite must be linked against
 # 
-TLIBS = @LIBS@
+TLIBS = @LIBS@ $(LIBS)
 
 # Flags controlling use of the in memory btree implementation
 #
@@ -272,8 +272,8 @@ SRC = \
   $(TOP)/src/sqliteInt.h \
   $(TOP)/src/sqliteLimit.h \
   $(TOP)/src/table.c \
-  $(TOP)/src/threads.c \
   $(TOP)/src/tclsqlite.c \
+  $(TOP)/src/threads.c \
   $(TOP)/src/tokenize.c \
   $(TOP)/src/treeview.c \
   $(TOP)/src/trigger.c \

diff --git a/ext/fts5/fts5Int.h b/ext/fts5/fts5Int.h
index ce066f2aa8b2fa39b21da1ed1108b4167014f712..407c9efed1a15dabfb33ef148f766105609ce001 100644 (file)
--- a/ext/fts5/fts5Int.h
+++ b/ext/fts5/fts5Int.h
@@ -46,6 +46,10 @@ typedef sqlite3_uint64 u64;
 
 #endif
 
+#ifndef SQLITE_PRIVATE
+# define SQLITE_PRIVATE static
+#endif
+
 
 /*
 ** Maximum number of prefix indexes on single FTS5 table. This must be

diff --git a/ext/fts5/tool/mkfts5c.tcl b/ext/fts5/tool/mkfts5c.tcl
index 5a5eeae0af07852c0b84e2c8704a886a6e5e250e..c1acf8a4939d133e72d86635a42b0d3ae237b108 100644 (file)
--- a/ext/fts5/tool/mkfts5c.tcl
+++ b/ext/fts5/tool/mkfts5c.tcl
@@ -88,7 +88,7 @@ proc fts5c_printfile {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"
+      set line "SQLITE_PRIVATE $line"
     }
     set line [string map $sub_map $line]
     puts $G(fd) $line

diff --git a/main.mk b/main.mk
index 0fddfafe6790030d89a8c95d89d86398df7f0163..98a906eaaf98caeddb88ff49f2fd78026f870a8a 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -12,6 +12,8 @@
 # THREADLIB        Specify any extra linker options needed to make the library
 #                  thread safe
 #
+# LIBS             Extra libraries options
+#
 # OPTS             Extra compiler command-line options.
 #
 # EXE              The suffix to add to executable files.  ".exe" for windows
@@ -48,6 +50,7 @@ TCCX =  $(TCC) $(OPTS) -I. -I$(TOP)/src -I$(TOP)
 TCCX += -I$(TOP)/ext/rtree -I$(TOP)/ext/icu -I$(TOP)/ext/fts3
 TCCX += -I$(TOP)/ext/async -I$(TOP)/ext/userauth
 TCCX += -I$(TOP)/ext/fts5
+THREADLIB += $(LIBS)
 
 # Object files for the SQLite library.
 #
@@ -59,7 +62,7 @@ LIBOBJ+= vdbe.o parse.o \
          fts3_snippet.o fts3_tokenizer.o fts3_tokenizer1.o \
          fts3_tokenize_vtab.o \
         fts3_unicode.o fts3_unicode2.o \
-         fts3_write.o func.o global.o hash.o \
+         fts3_write.o fts5.o func.o global.o hash.o \
          icu.o insert.o journal.o json1.o legacy.o loadext.o \
          main.o malloc.o mem0.o mem1.o mem2.o mem3.o mem5.o \
          memjournal.o \
@@ -331,8 +334,7 @@ TESTSRC += \
   $(TOP)/ext/misc/wholenumber.c \
   $(TOP)/ext/misc/vfslog.c \
   $(TOP)/ext/fts5/fts5_tcl.c \
-  $(TOP)/ext/fts5/fts5_test_mi.c \
-  fts5.c
+  $(TOP)/ext/fts5/fts5_test_mi.c
 
 
 #TESTSRC += $(TOP)/ext/fts2/fts2_tokenizer.c

diff --git a/manifest b/manifest
index 76f039490fe8c125d02ddbdfa9b7a5ada2655a74..2e1fa12c7f51694ac1d83158dbe423f0a6f994b2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,7 +1,7 @@
-C Json1\stests\sare\sworking.\s\sBuilds\swithout\sFTS5\senabled.\s\sStill\ssome\sproblems\nbuilding\swith\sFTS5.
-D 2015-10-08T23:37:00.134
+C Trying\sto\sget\sFTS5\stests\sto\sbuild\sand\srun\susing\smain.mk.\s\sNot\syet\sworking.
+D 2015-10-09T01:42:49.474
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in ab670f8513a9aac7e6367f791bf5ac685111d0a9
+F Makefile.in f0088ff0d2ac949fce6de7c00f13a99ac5bdb663
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 F Makefile.msc f95e14e549addbf22304f6c01901b600aea10a6d
 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
@@ -106,7 +106,7 @@ F ext/fts3/unicode/mkunicode.tcl 95cf7ec186e48d4985e433ff8a1c89090a774252
 F ext/fts3/unicode/parseunicode.tcl da577d1384810fb4e2b209bf3313074353193e95
 F ext/fts5/extract_api_docs.tcl a36e54ec777172ddd3f9a88daf593b00848368e0
 F ext/fts5/fts5.h 98f802fe41481f9d797fce496f0fefcad72c7782
-F ext/fts5/fts5Int.h ed6c05b803e0bacf85228a8d255853e89796f6f5
+F ext/fts5/fts5Int.h 3e682a711ffa249cb327eec5c1b3e5a3deba4050
 F ext/fts5/fts5_aux.c b09aa27dcdaa3d50a30be433fddaa48a50aa827b
 F ext/fts5/fts5_buffer.c b2fb69c1ee3378956c0d9ee964d61b59d296afaf
 F ext/fts5/fts5_config.c 57ee5fe71578cb494574fc0e6e51acb9a22a8695
@@ -186,7 +186,7 @@ F ext/fts5/test/fts5version.test 978f59541d8cef7e8591f8be2115ec5ccb863e2e
 F ext/fts5/test/fts5vocab.test cdf97b9678484e9bad5062edf9c9106e5c3b0c5c
 F ext/fts5/tool/fts5txt2db.tcl 3d19fb8ffb234031d33d7d2151acfbc55e9cfcc4
 F ext/fts5/tool/loadfts5.tcl 58e90407cc5c2b1770460119488fd7c0090d4dd3
-F ext/fts5/tool/mkfts5c.tcl 52a2bae4dd05ca2c635d7f744e7dd684a1401570
+F ext/fts5/tool/mkfts5c.tcl 21552771bdb9e2a44a975a1a84ffa0a5a39d57f0
 F ext/fts5/tool/showfts5.tcl 9eaf6c3df352f98a2ab5ce1921dd94128ab1381d
 F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43
 F ext/icu/icu.c b2732aef0b076e4276d9b39b5a33cec7a05e1413
@@ -264,7 +264,7 @@ F ext/userauth/userauth.c 5fa3bdb492f481bbc1709fc83c91ebd13460c69e
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk e78ca7d50592dd4a4f2c7a09db478034feabc92f
+F main.mk 82271e141b6b15693a66ddbdd1285c36e8606841
 F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
 F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@ -1357,7 +1357,7 @@ F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
 F tool/mkpragmatab.tcl 84af2b180484323a2ea22a2279e8bd9e3e1e492e
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c-noext.tcl 87240b09c20042999b41d5fabe091b7111287835
-F tool/mksqlite3c.tcl f38527a5125ada6705601d6665065a3bdf38ec64
+F tool/mksqlite3c.tcl b66b4170f693602cd6985aed15d9509fe2f18c84
 F tool/mksqlite3h.tcl e3ac3f23897d86cb8f5f5df92e91643229fcc8d1
 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
 F tool/mkvsix.tcl bbe57cd9ae11c6cc70319241101ef8d2b8c3765b
@@ -1390,7 +1390,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 53dd7c4c65842c5c9ed3e84edd62e24f2c9be15b
-R 9e61c8794766296f6abfb50c81f18f50
+P 2928f8e87d2e5d121e6e7e5993cbb773bb2b0603
+R 2760e46734f295e8733b8a00f5d6ba3d
 U drh
-Z a87c3731b988c508695a8d0d1121a40b
+Z 9cc40c2d063b915018c36739ed3ed59a

diff --git a/manifest.uuid b/manifest.uuid
index 9f32f5f37ec4f528d88c06afbb292c7017f91a11..bcd6fffe1fc297d5e1cdaf8a41b332e1e77b0eca 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2928f8e87d2e5d121e6e7e5993cbb773bb2b0603
\ No newline at end of file
+206174f9b154c590a3e2e94236db38e111d64bdb
\ No newline at end of file

diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index ce808faa9117d4991151378dda8ccd0976b75d49..23241e27a6ee4fa79e1c92f31c575f5c7a40b988 100644 (file)
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -211,7 +211,8 @@ proc copy_file {filename} {
       puts $out "#if 0"
     } elseif {!$linemacros && [regexp {^#line} $line]} {
       # Skip #line directives.
-    } elseif {$addstatic && ![regexp {^(static|typedef)} $line]} {
+    } elseif {$addstatic
+               && ![regexp {^(static|typedef|SQLITE_PRIVATE)} $line]} {
       # Skip adding the SQLITE_PRIVATE or SQLITE_API keyword before
       # functions if this header file does not need it.
       if {![info exists varonly_hdr($tail)]