Avoid including fts3_term.c in the amalgamation, as it contains test code only.

FossilOrigin-Name: f392b7ae0266b4c694836583cb91b10f2b6c0752

diff --git a/Makefile.in b/Makefile.in
index 01c4010b8e2715f7e63837d7ac6ed2c1d439f997..b0871ad940e727e737ed065100b3fa0e110ae7fa 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -166,7 +166,7 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
          callback.lo complete.lo ctime.lo date.lo delete.lo \
          expr.lo fault.lo fkey.lo \
          fts3.lo fts3_aux.lo fts3_expr.lo fts3_hash.lo fts3_icu.lo fts3_porter.lo \
-         fts3_snippet.lo fts3_term.lo fts3_tokenizer.lo fts3_tokenizer1.lo fts3_write.lo \
+         fts3_snippet.lo fts3_tokenizer.lo fts3_tokenizer1.lo fts3_write.lo \
          func.lo global.lo hash.lo \
          icu.lo insert.lo journal.lo legacy.lo loadext.lo \
          main.lo malloc.lo mem0.lo mem1.lo mem2.lo mem3.lo mem5.lo \
@@ -313,7 +313,6 @@ SRC += \
   $(TOP)/ext/fts3/fts3_icu.c \
   $(TOP)/ext/fts3/fts3_porter.c \
   $(TOP)/ext/fts3/fts3_snippet.c \
-  $(TOP)/ext/fts3/fts3_term.c \
   $(TOP)/ext/fts3/fts3_tokenizer.h \
   $(TOP)/ext/fts3/fts3_tokenizer.c \
   $(TOP)/ext/fts3/fts3_tokenizer1.c \
@@ -379,7 +378,8 @@ TESTSRC = \
   $(TOP)/src/test_thread.c \
   $(TOP)/src/test_vfs.c \
   $(TOP)/src/test_wholenumber.c \
-  $(TOP)/src/test_wsd.c
+  $(TOP)/src/test_wsd.c       \
+  $(TOP)/ext/fts3/fts3_term.c 
 
 # Source code to the library files needed by the test fixture
 #
@@ -836,9 +836,6 @@ fts3_porter.lo:     $(TOP)/ext/fts3/fts3_porter.c $(HDR) $(EXTHDR)
 fts3_snippet.lo:       $(TOP)/ext/fts3/fts3_snippet.c $(HDR) $(EXTHDR)
        $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_snippet.c
 
-fts3_term.lo:  $(TOP)/ext/fts3/fts3_term.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_term.c
-
 fts3_tokenizer.lo:     $(TOP)/ext/fts3/fts3_tokenizer.c $(HDR) $(EXTHDR)
        $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_tokenizer.c
 

diff --git a/ext/fts3/fts3Int.h b/ext/fts3/fts3Int.h
index b843fe9dc6fe26d3c4ed2478bdb516557e14806a..8d1e15737ded1318597aa8908bbf9546253d3528 100644 (file)
--- a/ext/fts3/fts3Int.h
+++ b/ext/fts3/fts3Int.h
@@ -381,6 +381,7 @@ int sqlite3Fts3ExprParse(sqlite3_tokenizer *,
 void sqlite3Fts3ExprFree(Fts3Expr *);
 #ifdef SQLITE_TEST
 int sqlite3Fts3ExprInitTestInterface(sqlite3 *db);
+int sqlite3Fts3InitTerm(sqlite3 *db);
 #endif
 
 /* fts3_aux.c */

diff --git a/main.mk b/main.mk
index 003574300351274b577926d81628d611866bf6b3..f84e0dea8bb8ceab16b7a560d925a21741ee0585 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -54,7 +54,7 @@ LIBOBJ+= alter.o analyze.o attach.o auth.o \
          backup.o bitvec.o btmutex.o btree.o build.o \
          callback.o complete.o ctime.o date.o delete.o expr.o fault.o fkey.o \
          fts3.o fts3_aux.o fts3_expr.o fts3_hash.o fts3_icu.o fts3_porter.o \
-         fts3_snippet.o fts3_term.o fts3_tokenizer.o fts3_tokenizer1.o \
+         fts3_snippet.o fts3_tokenizer.o fts3_tokenizer1.o \
          fts3_write.o func.o global.o hash.o \
          icu.o insert.o journal.o legacy.o loadext.o \
          main.o malloc.o mem0.o mem1.o mem2.o mem3.o mem5.o \
@@ -194,7 +194,6 @@ SRC += \
   $(TOP)/ext/fts3/fts3_icu.c \
   $(TOP)/ext/fts3/fts3_porter.c \
   $(TOP)/ext/fts3/fts3_snippet.c \
-  $(TOP)/ext/fts3/fts3_term.c \
   $(TOP)/ext/fts3/fts3_tokenizer.h \
   $(TOP)/ext/fts3/fts3_tokenizer.c \
   $(TOP)/ext/fts3/fts3_tokenizer1.c \
@@ -484,9 +483,6 @@ fts3_icu.o: $(TOP)/ext/fts3/fts3_icu.c $(HDR) $(EXTHDR)
 fts3_snippet.o:        $(TOP)/ext/fts3/fts3_snippet.c $(HDR) $(EXTHDR)
        $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_snippet.c
 
-fts3_term.o:   $(TOP)/ext/fts3/fts3_term.c $(HDR) $(EXTHDR)
-       $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_term.c
-
 fts3_porter.o: $(TOP)/ext/fts3/fts3_porter.c $(HDR) $(EXTHDR)
        $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_porter.c
 

diff --git a/manifest b/manifest
index 4a39930802ae9ce8584c8bc159b9bd3dc4640c1e..5d38b63563c797b66a332a0a49147379b305f459 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,7 +1,7 @@
-C Enhance\sWAL\smode\sso\sthat\sthe\sWAL\sfile\shonors\sthe\sjournal\ssize\slimit\sset\nby\sPRAGMA\sjournal_size_limit.
-D 2011-05-16T21:00:27.928
+C Avoid\sincluding\sfts3_term.c\sin\sthe\samalgamation,\sas\sit\scontains\stest\scode\sonly.
+D 2011-05-17T14:41:36.521
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in 4a7ed220f2e9a068fd0f0b2ec451439f63e629fc
+F Makefile.in 11dcc00a8d0e5202def00e81732784fb0cc4fe1d
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@ -63,7 +63,7 @@ F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9
 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
 F ext/fts3/fts3.c 0077bd07395d2aabafa1ed1b104552619ecad34a
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
-F ext/fts3/fts3Int.h 8c2ac39ee17362571c58ab2c4f0667324c31f738
+F ext/fts3/fts3Int.h 05d145152620e7849c452bd919f2cc3e2d75309f
 F ext/fts3/fts3_aux.c 9e931f55eed8498dafe7bc1160f10cbb1a652fdf
 F ext/fts3/fts3_expr.c 5f49e0deaf723724b08100bb3ff40aab02ad0c93
 F ext/fts3/fts3_hash.c 3c8f6387a4a7f5305588b203fa7c887d753e1f1c
@@ -102,7 +102,7 @@ F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
 F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
-F main.mk bedd9fb5f843eab5d575275ef7d906a1e58c30a2
+F main.mk 6111163d4e9720e4212ef288e967b4aa2c2ce379
 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
 F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
 F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@ -911,7 +911,7 @@ F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc
 F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
-F tool/mksqlite3c.tcl d171512b785283690b6f80997bee974c80087a23
+F tool/mksqlite3c.tcl 623e26cc8c83322e4151d3ad85ac69d41221bae8
 F tool/mksqlite3h.tcl d76c226a5e8e1f3b5f6593bcabe5e98b3b1ec9ff
 F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
 F tool/omittest.tcl b1dd290c1596e0f31fd335160a74ec5dfea3df4a
@@ -936,7 +936,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P e569f18b989aef853c9d71eaf73d6967f0a8c583
-R cf1687694ba42845f8565b086734fa2b
-U drh
-Z b788aa40bf13c0a5b33fd90cecbf33e8
+P db7e500f69faf1906a84991ba67d26a195f02ae5
+R ae580e6a17ad522b073057ba8349f079
+U dan
+Z c7b8c78d63b81a588c33ebb0305a0680

diff --git a/manifest.uuid b/manifest.uuid
index 8a54fcea5d8cacde2eea90962f3966365000d0dc..608d6308f7379b0363e825aeea506fb968bde4f8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-db7e500f69faf1906a84991ba67d26a195f02ae5
\ No newline at end of file
+f392b7ae0266b4c694836583cb91b10f2b6c0752
\ No newline at end of file

diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index f88ca08887f46dca0e2134df9ecee62a7855af01..fa99f2df7b7a41fe70201bf5625873c63a02ec46 100644 (file)
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -298,7 +298,6 @@ foreach file {
    fts3_expr.c
    fts3_hash.c
    fts3_porter.c
-   fts3_term.c
    fts3_tokenizer.c
    fts3_tokenizer1.c
    fts3_write.c