Modify the makefile(s) to know about the FTS1 module - however FTS1 is

turned off by default.  Bump the version number to 3.3.8. (CVS 3461)

FossilOrigin-Name: 288ff63783725a5d8f86b6171473bb4ae3c4e37b

diff --git a/Makefile.in b/Makefile.in
index 70c9a025b44e5ed4892d712ccdf27e197e5fe229..8486d5cb1dc7b6316c57e13031faaf43b7dd152a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -187,6 +187,18 @@ SRC = \
   $(TOP)/src/vtab.c \
   $(TOP)/src/where.c
 
+# Source code for extensions
+#
+SRC += \
+  $(TOP)/ext/fts1/fts1.c \
+  $(TOP)/ext/fts1/fts1.h \
+  $(TOP)/ext/fts1/fts1_hash.c \
+  $(TOP)/ext/fts1/fts1_hash.h \
+  $(TOP)/ext/fts1/fts1_porter.c \
+  $(TOP)/ext/fts1/fts1_tokenizer.h \
+  $(TOP)/ext/fts1/fts1_tokenizer1.c
+
+
 # Source code to the test files.
 #
 TESTSRC = \
@@ -234,6 +246,13 @@ HDR = \
    $(TOP)/src/vdbe.h \
    parse.h
 
+# Header files used by extensions
+#
+HDR += \
+  $(TOP)/ext/fts1/fts1.h \
+  $(TOP)/ext/fts1/fts1_hash.h \
+  $(TOP)/ext/fts1/fts1_tokenizer.h
+
 # Header files used by the VDBE submodule
 #
 VDBEHDR = \

diff --git a/VERSION b/VERSION
index 86fb6504403518a9d6027674d8ce1120235310e9..37d02a6e3801e87b329062ce78084da85c9e7709 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.3.7
+3.3.8

diff --git a/main.mk b/main.mk
index 82b46f0baf9f3057748b10ef7cddc043525e0ae1..caa16ed2af0aa537c0155540f774b3459774d79b 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -120,12 +120,25 @@ SRC = \
   $(TOP)/src/vtab.c \
   $(TOP)/src/where.c
 
+# Source code for extensions
+#
+SRC += \
+  $(TOP)/ext/fts1/fts1.c \
+  $(TOP)/ext/fts1/fts1.h \
+  $(TOP)/ext/fts1/fts1_hash.c \
+  $(TOP)/ext/fts1/fts1_hash.h \
+  $(TOP)/ext/fts1/fts1_porter.c \
+  $(TOP)/ext/fts1/fts1_tokenizer.h \
+  $(TOP)/ext/fts1/fts1_tokenizer1.c
+
+
 # Source code to the test files.
 #
 TESTSRC = \
   $(TOP)/src/btree.c \
   $(TOP)/src/date.c \
   $(TOP)/src/func.c \
+  $(TOP)/src/main.c \
   $(TOP)/src/os.c \
   $(TOP)/src/os_os2.c \
   $(TOP)/src/os_unix.c \
@@ -167,6 +180,14 @@ HDR = \
    $(TOP)/src/vdbe.h \
    parse.h
 
+# Header files used by extensions
+#
+HDR += \
+  $(TOP)/ext/fts1/fts1.h \
+  $(TOP)/ext/fts1/fts1_hash.h \
+  $(TOP)/ext/fts1/fts1_tokenizer.h
+
+
 # Header files used by the VDBE submodule
 #
 VDBEHDR = \

diff --git a/manifest b/manifest
index 22a449a75161be48d219428cc0f066b82133755c..f040c3b889687ebcdedab12aca0b644a053c8207 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Report\sthe\serror\sSQLITE_CORRUPT\sinstead\sof\sSQLITE_IOERR\sif\sunable\nto\srollback\sa\shot\sjournal\sthat\swas\sdamaged\s(for\sexample)\sby\sfilesystem\ncorruption\sfollowing\sa\spower\sfailure.\s(CVS\s3460)
-D 2006-10-03T19:05:19
-F Makefile.in cabd42d34340f49260bc2a7668c38eba8d4cfd99
+C Modify\sthe\smakefile(s)\sto\sknow\sabout\sthe\sFTS1\smodule\s-\showever\sFTS1\sis\nturned\soff\sby\sdefault.\s\sBump\sthe\sversion\snumber\sto\s3.3.8.\s(CVS\s3461)
+D 2006-10-03T19:12:32
+F Makefile.in 4379c909d46b38b8c5db3533084601621d4f14b2
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
-F VERSION ef6abd4b2095b0f378b428ed251e16f0213fcf3f
+F VERSION 9e94305f713b6e93b9432b92796b3b28d9bf0a93
 F aclocal.m4 a8df0ae21d1ac797fa7d7eaa1703412bc61b973f
 F addopcodes.awk 701697fae48376375ec8532c3d04e910cfeef352
 F art/2005osaward.gif 0d1851b2a7c1c9d0ccce545f3e14bca42d7fd248
@@ -34,7 +34,7 @@ F ext/fts1/simple_tokenizer.c 1844d72f7194c3fd3d7e4173053911bf0661b70d
 F ext/fts1/tokenizer.h 0c53421b832366d20d720d21ea3e1f6e66a36ef9
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh f6b283068efa69f06eb8aa1fe4bddfdbdeb35826
-F main.mk ffbbe60740e7601caa326bffe1e70ac3fdfb5bc4
+F main.mk 22acd3d279ec40ba6959af643ba25975fcfbdcc7
 F mkdll.sh cbc7d92d02f9317a3d24ab55bb727275417260ca
 F mkopcodec.awk bd46ad001c98dfbab07b1713cb8e692fa0e5415d
 F mkopcodeh.awk cde995d269aa06c94adbf6455bea0acedb913fa5
@@ -402,7 +402,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P f4103dea5e1a87adccccca715946e174d1cc7450
-R b823a4405d336e3437b697936d5ec2bd
+P 70501e4ea588ed762e4f6bc211ce63397faa3367
+R e608d22d93934718615b43088eb7db99
 U drh
-Z 59798d303c6fbc42955d097c88532f23
+Z c1ca20833118d2dc59259071f997a987

diff --git a/manifest.uuid b/manifest.uuid
index 59c301033f70234f3396d769b970709102a79091..7e6979fdab9850b0112df74805d442111c5f211c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-70501e4ea588ed762e4f6bc211ce63397faa3367
\ No newline at end of file
+288ff63783725a5d8f86b6171473bb4ae3c4e37b
\ No newline at end of file