Fix Makefile.in so that it works with the new unicode tokenizer of FTS3/4.

Update the version number to 3.7.13.

FossilOrigin-Name: b8720d0416b8d4af7d131f1ddc3d280d196a9eda

diff --git a/Makefile.in b/Makefile.in
index 3d7c74ba37cb617918834b49baa125eb472b1bdd..6e159ad548161d0fca40851c1900b4d82637a580 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -165,8 +165,9 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
          backup.lo bitvec.lo btmutex.lo btree.lo build.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.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_unicode.lo fts3_unicode2.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 \
@@ -317,6 +318,8 @@ SRC += \
   $(TOP)/ext/fts3/fts3_tokenizer.h \
   $(TOP)/ext/fts3/fts3_tokenizer.c \
   $(TOP)/ext/fts3/fts3_tokenizer1.c \
+  $(TOP)/ext/fts3/fts3_unicode.c \
+  $(TOP)/ext/fts3/fts3_unicode2.c \
   $(TOP)/ext/fts3/fts3_write.c
 SRC += \
   $(TOP)/ext/icu/sqliteicu.h \

diff --git a/VERSION b/VERSION
index 74d3416de0abe50f4a4b2f7810bc9402cff8073c..214b521fe220d3c853d5ed5f5012756c70a56ba2 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.7.12.1
+3.7.13

diff --git a/configure b/configure
index 13fe6f99a5ad6534c8c76f1a30ab40e83591a60e..cf50e609ea85aa419e35b24891f1067ab1a97128 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for sqlite 3.7.12.1.
+# Generated by GNU Autoconf 2.62 for sqlite 3.7.13.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -743,8 +743,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='sqlite'
 PACKAGE_TARNAME='sqlite'
-PACKAGE_VERSION='3.7.12.1'
-PACKAGE_STRING='sqlite 3.7.12.1'
+PACKAGE_VERSION='3.7.13'
+PACKAGE_STRING='sqlite 3.7.13'
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.
@@ -1485,7 +1485,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures sqlite 3.7.12.1 to adapt to many kinds of systems.
+\`configure' configures sqlite 3.7.13 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1550,7 +1550,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sqlite 3.7.12.1:";;
+     short | recursive ) echo "Configuration of sqlite 3.7.13:";;
    esac
   cat <<\_ACEOF
 
@@ -1666,7 +1666,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sqlite configure 3.7.12.1
+sqlite configure 3.7.13
 generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1680,7 +1680,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by sqlite $as_me 3.7.12.1, which was
+It was created by sqlite $as_me 3.7.13, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
@@ -14032,7 +14032,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sqlite $as_me 3.7.12.1, which was
+This file was extended by sqlite $as_me 3.7.13, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14085,7 +14085,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-sqlite config.status 3.7.12.1
+sqlite config.status 3.7.13
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/manifest b/manifest
index cdaf19041ac4fb4534dfc8bdbffb33bd34706f2f..56470f0a82a9cf626b1c6f3fdd2cad88b8f10d32 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,12 +1,12 @@
-C Add\sthe\smode=memory\soption\sto\sURI\sfilenames,\swhich\swhen\spresent\sforces\sthe\ndatabase\sto\sbe\san\sin-memory\sdatabase.\s\sThis\senables\snamed\sin-memory\sdatabases.
-D 2012-05-28T13:58:00.304
+C Fix\sMakefile.in\sso\sthat\sit\sworks\swith\sthe\snew\sunicode\stokenizer\sof\sFTS3/4.\nUpdate\sthe\sversion\snumber\sto\s3.7.13.
+D 2012-05-28T15:32:09.872
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
+F Makefile.in 4f37eb61be9d38643cdd839a74b8e3bad724cfcf
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 F Makefile.msc 7849a871b6cdb20fd51baee6bbe5965a03326be4
 F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
-F VERSION 1e25ebddd2ed5811c10bdabe914cd46d2dc38af8
+F VERSION 3e857b9b826e818eec9411eafe2c3fa22c1dbb8a
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
 F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@ -15,7 +15,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
 F config.h.in 0921066a13130082764ab4ab6456f7b5bebe56de
 F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
-F configure faa04198b719ec9cb2166aa0b163558e9b8ddd77 x
+F configure 79405675c313ce4a5e94afac6ec880bb3e27b4f1 x
 F configure.ac 9ee886c21c095b3272137b1553ae416c8b8c8557
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html 3091574143dd3415669b6745843ff8d011d33549
@@ -1004,7 +1004,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P c00bb5d4601efc15933f222349e96a043b610a19
-R 9e44b5ae3872c9bc977aa50c770bf24a
+P 651520fa84ee0c488bef660bab9865500309d5e9
+R f3c8a67425dabbd564ab692dd7aa94a5
 U drh
-Z 18aef601d2d3d45f555f16b789eead33
+Z 58dc5143c398d49dd07e91ba15cc103e

diff --git a/manifest.uuid b/manifest.uuid
index fbafadc0f313313ebba1d1cf45bad05523d920f2..d54167a7b8d1a03712f56344acd9f0d3de719c74 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-651520fa84ee0c488bef660bab9865500309d5e9
\ No newline at end of file
+b8720d0416b8d4af7d131f1ddc3d280d196a9eda
\ No newline at end of file