From 671b52242b48bb1e5a99c8937a7ff4cf9e283c59 Mon Sep 17 00:00:00 2001 From: shaneh Date: Thu, 12 May 2011 21:01:12 +0000 Subject: [PATCH] Add fts3_term.c to amalg gen script and configure input files. FossilOrigin-Name: 6ee0773290a4c4aac2b2b5e1741e65170e08a8bb --- Makefile.in | 11 ++++++++--- manifest | 16 ++++++++-------- manifest.uuid | 2 +- tool/mksqlite3c.tcl | 1 + 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/Makefile.in b/Makefile.in index f3239f3d79..01c4010b8e 100644 --- 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_tokenizer.lo fts3_tokenizer1.lo fts3_write.lo \ + fts3_snippet.lo fts3_term.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,6 +313,7 @@ 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 \ @@ -420,6 +421,7 @@ TESTSRC2 = \ $(TOP)/ext/fts3/fts3.c \ $(TOP)/ext/fts3/fts3_aux.c \ $(TOP)/ext/fts3/fts3_expr.c \ + $(TOP)/ext/fts3/fts3_term.c \ $(TOP)/ext/fts3/fts3_tokenizer.c \ $(TOP)/ext/fts3/fts3_write.c \ $(TOP)/ext/async/sqlite3async.c @@ -828,11 +830,14 @@ fts3_hash.lo: $(TOP)/ext/fts3/fts3_hash.c $(HDR) $(EXTHDR) fts3_icu.lo: $(TOP)/ext/fts3/fts3_icu.c $(HDR) $(EXTHDR) $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_icu.c +fts3_porter.lo: $(TOP)/ext/fts3/fts3_porter.c $(HDR) $(EXTHDR) + $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_porter.c + fts3_snippet.lo: $(TOP)/ext/fts3/fts3_snippet.c $(HDR) $(EXTHDR) $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_snippet.c -fts3_porter.lo: $(TOP)/ext/fts3/fts3_porter.c $(HDR) $(EXTHDR) - $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_porter.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/manifest b/manifest index 9ed32b67a9..1415b061f0 100644 --- a/manifest +++ b/manifest @@ -1,7 +1,7 @@ -C Improvements\sto\sdocumentation\shyperlinks.\s\sChange\sthe\svalue\sof\nSQLITE_OPEN_URI\sto\san\sunreserved\svalue. -D 2011-05-11T20:54:32.761 +C Add\sfts3_term.c\sto\samalg\sgen\sscript\sand\sconfigure\sinput\sfiles. +D 2011-05-12T21:01:12.782 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f -F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2 +F Makefile.in 4a7ed220f2e9a068fd0f0b2ec451439f63e629fc F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6 @@ -910,7 +910,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 623e26cc8c83322e4151d3ad85ac69d41221bae8 +F tool/mksqlite3c.tcl d171512b785283690b6f80997bee974c80087a23 F tool/mksqlite3h.tcl d76c226a5e8e1f3b5f6593bcabe5e98b3b1ec9ff F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87 F tool/omittest.tcl b1dd290c1596e0f31fd335160a74ec5dfea3df4a @@ -935,7 +935,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 8885c8677b239d4cbef24b9409a1736e1ae97a3f -R 4c0850c5e479c451c0b9f9d3c09b6b6d -U drh -Z d48f7732010e4bf6308d6bb0dacbdaca +P 851ab75d5f5d64d95d6237c28658bbc32145b78b +R f2444b92fe2cfe7d047908f98416ca93 +U shaneh +Z aec7145a879a050a92e29403b1ef0483 diff --git a/manifest.uuid b/manifest.uuid index c35fe83711..f29a126a22 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -851ab75d5f5d64d95d6237c28658bbc32145b78b \ No newline at end of file +6ee0773290a4c4aac2b2b5e1741e65170e08a8bb \ No newline at end of file diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl index fa99f2df7b..f88ca08887 100644 --- a/tool/mksqlite3c.tcl +++ b/tool/mksqlite3c.tcl @@ -298,6 +298,7 @@ foreach file { fts3_expr.c fts3_hash.c fts3_porter.c + fts3_term.c fts3_tokenizer.c fts3_tokenizer1.c fts3_write.c -- 2.47.2