From: drh <drh@noemail.net>
Date: Fri, 18 Jun 2004 11:29:35 +0000 (+0000)
Subject: Update the Makefile.in, version number, change log, etc for the 3.0.0
X-Git-Tag: version-3.6.10~4462
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=829512baa01e3aea7487023e2577f6e0c142fcd0;p=thirdparty%2Fsqlite.git

Update the Makefile.in, version number, change log, etc for the 3.0.0
release. (CVS 1617)

FossilOrigin-Name: 917391e05ef45fd1eae883a99e6bbe6d7df3cc1c
---

diff --git a/Makefile.in b/Makefile.in
index 3d83afd6ad..ba6839f281 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -84,17 +84,13 @@ endif
 
 # Object files for the SQLite library.
 #
-LIBOBJ = attach.lo auth.lo btree.lo build.lo copy.lo date.lo \
-         delete.lo encode.lo expr.lo func.lo hash.lo insert.lo \
-         main.lo opcodes.lo os.lo pager.lo parse.lo pragma.lo \
-         printf.lo random.lo select.lo table.lo tokenize.lo \
-         update.lo util.lo vacuum.lo vdbe.lo vdbeaux.lo \
-         where.lo trigger.lo
-
-# Only build the in-core DB if it is required.
-ifeq (${INMEMORYDB},1)
-LIBOBJ += btree_rb.lo
-endif
+LIBOBJ = attach.lo auth.lo btree.lo build.lo date.lo delete.lo \
+         expr.lo func.lo hash.lo insert.lo \
+         main.lo opcodes.lo os_mac.lo os_unix.lo os_win.lo \
+         pager.lo parse.lo pragma.lo printf.lo random.lo \
+         select.lo table.lo tokenize.lo trigger.lo update.lo util.lo vacuum.lo \
+         vdbe.lo vdbeapi.lo vdbeaux.lo vdbemem.lo \
+         where.lo utf.lo legacy.lo
 
 # All of the source code files.
 #
@@ -103,9 +99,7 @@ SRC = \
   $(TOP)/src/auth.c \
   $(TOP)/src/btree.c \
   $(TOP)/src/btree.h \
-  $(TOP)/src/btree_rb.c \
   $(TOP)/src/build.c \
-  $(TOP)/src/copy.c \
   $(TOP)/src/date.c \
   $(TOP)/src/delete.c \
   $(TOP)/src/encode.c \
@@ -114,8 +108,11 @@ SRC = \
   $(TOP)/src/hash.c \
   $(TOP)/src/hash.h \
   $(TOP)/src/insert.c \
+  $(TOP)/src/legacy.c \
   $(TOP)/src/main.c \
-  $(TOP)/src/os.c \
+  $(TOP)/src/os_mac.c \
+  $(TOP)/src/os_unix.c \
+  $(TOP)/src/os_win.c \
   $(TOP)/src/pager.c \
   $(TOP)/src/pager.h \
   $(TOP)/src/parse.y \
@@ -130,12 +127,16 @@ SRC = \
   $(TOP)/src/tclsqlite.c \
   $(TOP)/src/tokenize.c \
   $(TOP)/src/trigger.c \
+  $(TOP)/src/utf.c \
   $(TOP)/src/update.c \
   $(TOP)/src/util.c \
   $(TOP)/src/vacuum.c \
   $(TOP)/src/vdbe.c \
-  $(TOP)/src/vdbeaux.c \
   $(TOP)/src/vdbe.h \
+  $(TOP)/src/vdbeapi.c \
+  $(TOP)/src/vdbeaux.c \
+  $(TOP)/src/vdbemem.c \
+  $(TOP)/src/vdbeInt.h \
   $(TOP)/src/where.c
 
 # Source code to the test files.
@@ -143,26 +144,33 @@ SRC = \
 TESTSRC = \
   $(TOP)/src/btree.c \
   $(TOP)/src/func.c \
-  $(TOP)/src/os.c \
+  $(TOP)/src/os_mac.c \
+  $(TOP)/src/os_unix.c \
+  $(TOP)/src/os_win.c \
   $(TOP)/src/pager.c \
   $(TOP)/src/test1.c \
   $(TOP)/src/test2.c \
   $(TOP)/src/test3.c \
   $(TOP)/src/test4.c \
+  $(TOP)/src/test5.c \
   $(TOP)/src/vdbe.c \
   $(TOP)/src/md5.c
 
 # Header files used by all library source files.
 #
 HDR = \
-   sqlite.h  \
+   sqlite3.h  \
    $(TOP)/src/btree.h \
    config.h \
    $(TOP)/src/hash.h \
    opcodes.h \
    $(TOP)/src/os.h \
+   $(TOP)/src/os_common.h \
+   $(TOP)/src/os_mac.h \
+   $(TOP)/src/os_unix.h \
+   $(TOP)/src/os_win.h \
    $(TOP)/src/sqliteInt.h  \
-   $(TOP)/src/vdbe.h  \
+   $(TOP)/src/vdbe.h \
    parse.h
 
 # Header files used by the VDBE submodule
@@ -174,7 +182,7 @@ VDBEHDR = \
 # This is the default Makefile target.  The objects listed here
 # are what get build when you type just "make" with no arguments.
 #
-all:	sqlite.h libsqlite.la sqlite@TARGET_EXEEXT@
+all:	sqlite3.h libsqlite3.la sqlite3@TARGET_EXEEXT@
 
 Makefile: $(TOP)/Makefile.in
 	./config.status
@@ -186,18 +194,18 @@ last_change:	$(SRC)
 	cat $(SRC) | grep '$$Id: ' | sort +4 | tail -1 \
           | awk '{print $$5,$$6}' >last_change
 
-libsqlite.la:	$(LIBOBJ)
-	$(LTLINK) -o libsqlite.la $(LIBOBJ) ${RELEASE} -rpath @exec_prefix@/lib \
+libsqlite3.la:	$(LIBOBJ)
+	$(LTLINK) -o libsqlite3.la $(LIBOBJ) ${RELEASE} -rpath @exec_prefix@/lib \
 		-version-info "8:6:8"
 
-libtclsqlite.la:	tclsqlite.lo libsqlite.la
-	$(LTLINK) -o libtclsqlite.la tclsqlite.lo \
-		libsqlite.la $(LIBTCL) -rpath @exec_prefix@/lib/sqlite \
+libtclsqlite3.la:	tclsqlite.lo libsqlite3.la
+	$(LTLINK) -o libtclsqlite3.la tclsqlite.lo \
+		libsqlite3.la $(LIBTCL) -rpath @exec_prefix@/lib/sqlite \
 		-version-info "8:6:8"
 
-sqlite@TARGET_EXEEXT@:	$(TOP)/src/shell.c libsqlite.la sqlite.h
-	$(LTLINK) $(READLINE_FLAGS) -o sqlite $(TOP)/src/shell.c \
-		libsqlite.la $(LIBREADLINE)
+sqlite3@TARGET_EXEEXT@:	$(TOP)/src/shell.c libsqlite3.la sqlite3.h
+	$(LTLINK) $(READLINE_FLAGS) -o sqlite3 $(TOP)/src/shell.c \
+		libsqlite3.la $(LIBREADLINE)
 
 # This target creates a directory named "tsrc" and fills it with
 # copies of all of the C source code and header files needed to
@@ -218,49 +226,21 @@ lemon@BUILD_EXEEXT@:	$(TOP)/tool/lemon.c $(TOP)/tool/lempar.c
 	$(BCC) -o lemon $(TOP)/tool/lemon.c
 	cp $(TOP)/tool/lempar.c .
 
+
+# Rules to build individual files
+#
+attach.lo:	$(TOP)/src/attach.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/src/attach.c
+
+auth.lo:	$(TOP)/src/auth.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/src/auth.c
+
 btree.lo:	$(TOP)/src/btree.c $(HDR) $(TOP)/src/pager.h
 	$(LTCOMPILE) -c $(TOP)/src/btree.c
 
-btree_rb.lo:	$(TOP)/src/btree_rb.c $(HDR)
-	$(LTCOMPILE) -c $(TOP)/src/btree_rb.c
-
 build.lo:	$(TOP)/src/build.c $(HDR)
 	$(LTCOMPILE) -c $(TOP)/src/build.c
 
-main.lo:	$(TOP)/src/main.c $(HDR)
-	$(LTCOMPILE) -c ${INCOREFLAGS} $(TOP)/src/main.c
-
-pager.lo:	$(TOP)/src/pager.c $(HDR) $(TOP)/src/pager.h
-	$(LTCOMPILE) -c $(TOP)/src/pager.c
-
-opcodes.lo:	opcodes.c
-	$(LTCOMPILE) -c opcodes.c
-
-opcodes.c:	$(TOP)/src/vdbe.c
-	echo '/* Automatically generated file.  Do not edit */' >opcodes.c
-	echo 'char *sqliteOpcodeNames[] = { "???", ' >>opcodes.c
-	grep '^case OP_' $(TOP)/src/vdbe.c | \
-	  sed -e 's/^.*OP_/  "/' -e 's/:.*$$/", /' >>opcodes.c
-	echo '};' >>opcodes.c
-
-opcodes.h:	$(TOP)/src/vdbe.h
-	echo '/* Automatically generated file.  Do not edit */' >opcodes.h
-	grep '^case OP_' $(TOP)/src/vdbe.c | \
-	  sed -e 's/://' | \
-	  awk '{printf "#define %-30s %3d\n", $$2, ++cnt}' >>opcodes.h
-
-os.lo:	$(TOP)/src/os.c $(HDR)
-	$(LTCOMPILE) -c $(TOP)/src/os.c
-
-parse.lo:	parse.c $(HDR)
-	$(LTCOMPILE) -c parse.c
-
-parse.h:	parse.c
-
-parse.c:	$(TOP)/src/parse.y lemon@BUILD_EXEEXT@
-	cp $(TOP)/src/parse.y .
-	./lemon parse.y
-
 # The config.h file will contain a single #define that tells us how
 # many bytes are in a pointer.  This only works if a pointer is the
 # same size on the host as it is on the target.  If you are cross-compiling
@@ -277,29 +257,6 @@ config.h:
 	echo >>config.h
 	rm -f temp.c temp
 
-sqlite.h:	$(TOP)/src/sqlite.h.in 
-	sed -e s/--VERS--/`cat ${TOP}/VERSION`/ \
-            -e s/--ENCODING--/$(ENCODING)/ \
-                 $(TOP)/src/sqlite.h.in >sqlite.h
-
-tokenize.lo:	$(TOP)/src/tokenize.c $(HDR)
-	$(LTCOMPILE) -c $(TOP)/src/tokenize.c
-
-util.lo:	$(TOP)/src/util.c $(HDR)
-	$(LTCOMPILE) -c $(TOP)/src/util.c
-
-vdbe.lo:	$(TOP)/src/vdbe.c $(VDBEHDR)
-	$(LTCOMPILE) -c $(TOP)/src/vdbe.c
-
-vdbeaux.lo:	$(TOP)/src/vdbe.c $(VDBEHDR)
-	$(LTCOMPILE) -c $(TOP)/src/vdbeaux.c
-
-where.lo:	$(TOP)/src/where.c $(HDR)
-	$(LTCOMPILE) -c $(TOP)/src/where.c
-
-copy.lo:	$(TOP)/src/copy.c $(HDR)
-	$(LTCOMPILE) -c $(TOP)/src/copy.c
-
 date.lo:	$(TOP)/src/date.c $(HDR)
 	$(LTCOMPILE) -c $(TOP)/src/date.c
 
@@ -321,49 +278,116 @@ hash.lo:	$(TOP)/src/hash.c $(HDR)
 insert.lo:	$(TOP)/src/insert.c $(HDR)
 	$(LTCOMPILE) -c $(TOP)/src/insert.c
 
+legacy.lo:	$(TOP)/src/legacy.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/src/legacy.c
+
+main.lo:	$(TOP)/src/main.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/src/main.c
+
+pager.lo:	$(TOP)/src/pager.c $(HDR) $(TOP)/src/pager.h
+	$(LTCOMPILE) -c $(TOP)/src/pager.c
+
+opcodes.lo:	opcodes.c
+	$(LTCOMPILE) -c opcodes.c
+
+opcodes.c:	$(TOP)/src/vdbe.c
+	echo '/* Automatically generated file.  Do not edit */' >opcodes.c
+	echo 'char *sqlite3OpcodeNames[] = { "???", ' >>opcodes.c
+	grep '^case OP_' $(TOP)/src/vdbe.c | \
+	  sed -e 's/^.*OP_/  "/' -e 's/:.*$$/", /' >>opcodes.c
+	echo '};' >>opcodes.c
+
+opcodes.h:	$(TOP)/src/vdbe.h
+	echo '/* Automatically generated file.  Do not edit */' >opcodes.h
+	grep '^case OP_' $(TOP)/src/vdbe.c | \
+	  sed -e 's/://' | \
+	  awk '{printf "#define %-30s %3d\n", $$2, ++cnt}' >>opcodes.h
+
+os_mac.lo:	$(TOP)/src/os_mac.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/src/os_mac.c
+
+os_unix.lo:	$(TOP)/src/os_unix.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/src/os_unix.c
+
+os_win.lo:	$(TOP)/src/os_win.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/src/os_win.c
+
+parse.lo:	parse.c $(HDR)
+	$(LTCOMPILE) -c parse.c
+
+parse.h:	parse.c
+
+parse.c:	$(TOP)/src/parse.y lemon
+	cp $(TOP)/src/parse.y .
+	./lemon parse.y
+
+pragma.lo:	$(TOP)/src/pragma.c $(HDR)
+	$(LTCOMPILE) $(TCL_FLAGS) -c $(TOP)/src/pragma.c
+
+printf.lo:	$(TOP)/src/printf.c $(HDR)
+	$(LTCOMPILE) $(TCL_FLAGS) -c $(TOP)/src/printf.c
+
 random.lo:	$(TOP)/src/random.c $(HDR)
 	$(LTCOMPILE) -c $(TOP)/src/random.c
 
 select.lo:	$(TOP)/src/select.c $(HDR)
 	$(LTCOMPILE) -c $(TOP)/src/select.c
 
+sqlite3.h:	$(TOP)/src/sqlite.h.in 
+	sed -e s/--VERS--/`cat ${TOP}/VERSION`/ \
+            -e s/--ENCODING--/$(ENCODING)/ \
+                 $(TOP)/src/sqlite.h.in >sqlite3.h
+
 table.lo:	$(TOP)/src/table.c $(HDR)
 	$(LTCOMPILE) -c $(TOP)/src/table.c
 
+tclsqlite.lo:	$(TOP)/src/tclsqlite.c $(HDR)
+	$(LTCOMPILE) $(TCL_FLAGS) -c $(TOP)/src/tclsqlite.c
+
+tokenize.lo:	$(TOP)/src/tokenize.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/src/tokenize.c
+
 trigger.lo:	$(TOP)/src/trigger.c $(HDR)
 	$(LTCOMPILE) -c $(TOP)/src/trigger.c
 
 update.lo:	$(TOP)/src/update.c $(HDR)
 	$(LTCOMPILE) -c $(TOP)/src/update.c
 
+utf.lo:	$(TOP)/src/utf.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/src/utf.c
+
+util.lo:	$(TOP)/src/util.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/src/util.c
+
 vacuum.lo:	$(TOP)/src/vacuum.c $(HDR)
 	$(LTCOMPILE) -c $(TOP)/src/vacuum.c
 
-tclsqlite.lo:	$(TOP)/src/tclsqlite.c $(HDR)
-	$(LTCOMPILE) $(TCL_FLAGS) -c $(TOP)/src/tclsqlite.c
+vdbe.lo:	$(TOP)/src/vdbe.c $(VDBEHDR)
+	$(LTCOMPILE) -c $(TOP)/src/vdbe.c
 
-pragma.lo:	$(TOP)/src/pragma.c $(HDR)
-	$(LTCOMPILE) $(TCL_FLAGS) -c $(TOP)/src/pragma.c
+vdbeapi.lo:	$(TOP)/src/vdbeapi.c $(VDBEHDR)
+	$(LTCOMPILE) -c $(TOP)/src/vdbeapi.c
 
-printf.lo:	$(TOP)/src/printf.c $(HDR)
-	$(LTCOMPILE) $(TCL_FLAGS) -c $(TOP)/src/printf.c
+vdbeaux.lo:	$(TOP)/src/vdbeaux.c $(VDBEHDR)
+	$(LTCOMPILE) -c $(TOP)/src/vdbeaux.c
 
-attach.lo:	$(TOP)/src/attach.c $(HDR)
-	$(LTCOMPILE) $(TCL_FLAGS) -c $(TOP)/src/attach.c
+vdbemem.lo:	$(TOP)/src/vdbemem.c $(VDBEHDR)
+	$(LTCOMPILE) -c $(TOP)/src/vdbemem.c
 
-auth.lo:	$(TOP)/src/auth.c $(HDR)
-	$(LTCOMPILE) $(TCL_FLAGS) -c $(TOP)/src/auth.c
+where.lo:	$(TOP)/src/where.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/src/where.c
 
 tclsqlite-sh.lo:	$(TOP)/src/tclsqlite.c $(HDR)
 	$(LTCOMPILE) $(TCL_FLAGS) -DTCLSH=1 -o $@ -c $(TOP)/src/tclsqlite.c
 
-tclsqlite:	tclsqlite-sh.lo libsqlite.la
-	$(LTLINK) $(TCL_FLAGS) -o tclsqlite tclsqlite-sh.lo libsqlite.la $(LIBTCL)
+tclsqlite3:	tclsqlite-sh.lo libsqlite3.la
+	$(LTLINK) $(TCL_FLAGS) -o tclsqlite3 tclsqlite-sh.lo \
+		 libsqlite3.la $(LIBTCL)
 
-testfixture@TARGET_EXEEXT@:	$(TOP)/src/tclsqlite.c libtclsqlite.la libsqlite.la $(TESTSRC)
+testfixture@TARGET_EXEEXT@:	$(TOP)/src/tclsqlite.c libtclsqlite3.la libsqlite3.la $(TESTSRC)
 	$(LTLINK) $(TCL_FLAGS) -DTCLSH=1 -DSQLITE_TEST=1\
                 -o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \
-		libtclsqlite.la libsqlite.la $(LIBTCL)
+		libtclsqlite3.la libsqlite3.la $(LIBTCL)
 
 fulltest:	testfixture@TARGET_EXEEXT@ sqlite@TARGET_EXEEXT@
 	./testfixture $(TOP)/test/all.test
@@ -371,111 +395,166 @@ fulltest:	testfixture@TARGET_EXEEXT@ sqlite@TARGET_EXEEXT@
 test:	testfixture@TARGET_EXEEXT@ sqlite@TARGET_EXEEXT@
 	./testfixture $(TOP)/test/quick.test
 
-index.html:	$(TOP)/www/index.tcl last_change
-	tclsh $(TOP)/www/index.tcl `cat $(TOP)/VERSION` >index.html
 
-sqlite.html:	$(TOP)/www/sqlite.tcl
-	tclsh $(TOP)/www/sqlite.tcl >sqlite.html
+# Rules used to build documentation
+#
+arch.html:	$(TOP)/www/arch.tcl
+	tclsh $(TOP)/www/arch.tcl >arch.html
+
+arch.png:	$(TOP)/www/arch.png
+	cp $(TOP)/www/arch.png .
 
 c_interface.html:	$(TOP)/www/c_interface.tcl
 	tclsh $(TOP)/www/c_interface.tcl >c_interface.html
 
+capi3.html:	$(TOP)/www/capi3.tcl
+	tclsh $(TOP)/www/capi3.tcl >capi3.html
+
+capi3ref.html:	$(TOP)/www/capi3ref.tcl
+	tclsh $(TOP)/www/capi3ref.tcl >capi3ref.html
+
 changes.html:	$(TOP)/www/changes.tcl
 	tclsh $(TOP)/www/changes.tcl >changes.html
 
-lang.html:	$(TOP)/www/lang.tcl
-	tclsh $(TOP)/www/lang.tcl >lang.html
+copyright.html:	$(TOP)/www/copyright.tcl
+	tclsh $(TOP)/www/copyright.tcl >copyright.html
 
-vdbe.html:	$(TOP)/www/vdbe.tcl
-	tclsh $(TOP)/www/vdbe.tcl >vdbe.html
+copyright-release.html:	$(TOP)/www/copyright-release.html
+	cp $(TOP)/www/copyright-release.html .
 
-arch.html:	$(TOP)/www/arch.tcl
-	tclsh $(TOP)/www/arch.tcl >arch.html
+copyright-release.pdf:	$(TOP)/www/copyright-release.pdf
+	cp $(TOP)/www/copyright-release.pdf .
 
-arch.png:	$(TOP)/www/arch.png
-	cp $(TOP)/www/arch.png .
+common.tcl:	$(TOP)/www/common.tcl
+	cp $(TOP)/www/common.tcl .
 
-opcode.html:	$(TOP)/www/opcode.tcl $(TOP)/src/vdbe.c
-	tclsh $(TOP)/www/opcode.tcl $(TOP)/src/vdbe.c >opcode.html
+conflict.html:	$(TOP)/www/conflict.tcl
+	tclsh $(TOP)/www/conflict.tcl >conflict.html
 
-mingw.html:	$(TOP)/www/mingw.tcl
-	tclsh $(TOP)/www/mingw.tcl >mingw.html
+datatypes.html:	$(TOP)/www/datatypes.tcl
+	tclsh $(TOP)/www/datatypes.tcl >datatypes.html
 
-tclsqlite.html:	$(TOP)/www/tclsqlite.tcl
-	tclsh $(TOP)/www/tclsqlite.tcl >tclsqlite.html
+datatype3.html:	$(TOP)/www/datatype3.tcl
+	tclsh $(TOP)/www/datatype3.tcl >datatype3.html
 
-speed.html:	$(TOP)/www/speed.tcl
-	tclsh $(TOP)/www/speed.tcl >speed.html
+docs.html:	$(TOP)/www/docs.tcl
+	tclsh $(TOP)/www/docs.tcl >docs.html
+
+download.html:	$(TOP)/www/download.tcl
+	tclsh $(TOP)/www/download.tcl >download.html
 
 faq.html:	$(TOP)/www/faq.tcl
 	tclsh $(TOP)/www/faq.tcl >faq.html
 
+fileformat.html:	$(TOP)/www/fileformat.tcl
+	tclsh $(TOP)/www/fileformat.tcl >fileformat.html
+
 formatchng.html:	$(TOP)/www/formatchng.tcl
 	tclsh $(TOP)/www/formatchng.tcl >formatchng.html
 
-conflict.html:	$(TOP)/www/conflict.tcl
-	tclsh $(TOP)/www/conflict.tcl >conflict.html
+index.html:	$(TOP)/www/index.tcl last_change
+	tclsh $(TOP)/www/index.tcl >index.html
 
-download.html:	$(TOP)/www/download.tcl
-	tclsh $(TOP)/www/download.tcl >download.html
+lang.html:	$(TOP)/www/lang.tcl
+	tclsh $(TOP)/www/lang.tcl >lang.html
+
+lockingv3.html:	$(TOP)/www/lockingv3.tcl
+	tclsh $(TOP)/www/lockingv3.tcl >lockingv3.html
+
+oldnews.html:	$(TOP)/www/oldnews.tcl
+	tclsh $(TOP)/www/oldnews.tcl >oldnews.html
 
 omitted.html:	$(TOP)/www/omitted.tcl
 	tclsh $(TOP)/www/omitted.tcl >omitted.html
 
-datatypes.html:	$(TOP)/www/datatypes.tcl
-	tclsh $(TOP)/www/datatypes.tcl >datatypes.html
+opcode.html:	$(TOP)/www/opcode.tcl $(TOP)/src/vdbe.c
+	tclsh $(TOP)/www/opcode.tcl $(TOP)/src/vdbe.c >opcode.html
+
+mingw.html:	$(TOP)/www/mingw.tcl
+	tclsh $(TOP)/www/mingw.tcl >mingw.html
+
+nulls.html:	$(TOP)/www/nulls.tcl
+	tclsh $(TOP)/www/nulls.tcl >nulls.html
 
 quickstart.html:	$(TOP)/www/quickstart.tcl
 	tclsh $(TOP)/www/quickstart.tcl >quickstart.html
 
-fileformat.html:	$(TOP)/www/fileformat.tcl
-	tclsh $(TOP)/www/fileformat.tcl >fileformat.html
+speed.html:	$(TOP)/www/speed.tcl
+	tclsh $(TOP)/www/speed.tcl >speed.html
 
-nulls.html:	$(TOP)/www/nulls.tcl
-	tclsh $(TOP)/www/nulls.tcl >nulls.html
+sqlite.gif:	$(TOP)/art/SQLite.gif
+	cp $(TOP)/art/SQLite.gif sqlite.gif
+
+sqlite.html:	$(TOP)/www/sqlite.tcl
+	tclsh $(TOP)/www/sqlite.tcl >sqlite.html
+
+support.html:	$(TOP)/www/support.tcl
+	tclsh $(TOP)/www/support.tcl >support.html
+
+tclsqlite.html:	$(TOP)/www/tclsqlite.tcl
+	tclsh $(TOP)/www/tclsqlite.tcl >tclsqlite.html
+
+vdbe.html:	$(TOP)/www/vdbe.tcl
+	tclsh $(TOP)/www/vdbe.tcl >vdbe.html
+
+version3.html:	$(TOP)/www/version3.tcl
+	tclsh $(TOP)/www/version3.tcl >version3.html
 
 
 # Files to be published on the website.
 #
 DOC = \
-  index.html \
-  sqlite.html \
-  changes.html \
-  lang.html \
-  opcode.html \
   arch.html \
   arch.png \
-  vdbe.html \
   c_interface.html \
-  mingw.html \
-  tclsqlite.html \
+  capi3.html \
+  capi3ref.html \
+  changes.html \
+  copyright.html \
+  copyright-release.html \
+  copyright-release.pdf \
+  conflict.html \
+  datatypes.html \
+  datatype3.html \
+  docs.html \
   download.html \
-  speed.html \
   faq.html \
+  fileformat.html \
   formatchng.html \
-  conflict.html \
+  index.html \
+  lang.html \
+  lockingv3.html \
+  mingw.html \
+  nulls.html \
+  oldnews.html \
   omitted.html \
-  datatypes.html \
+  opcode.html \
   quickstart.html \
-  fileformat.html \
-  nulls.html
+  speed.html \
+  sqlite.gif \
+  sqlite.html \
+  support.html \
+  tclsqlite.html \
+  vdbe.html \
+  version3.html
 
 doc:	$(DOC)
 	mkdir -p doc
 	mv $(DOC) doc
 
-install:	sqlite libsqlite.la sqlite.h
+install:	sqlite3 libsqlite3.la sqlite3.h
 	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib
-	$(LTINSTALL) libsqlite.la $(DESTDIR)$(exec_prefix)/lib
+	$(LTINSTALL) libsqlite3.la $(DESTDIR)$(exec_prefix)/lib
 	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin
-	$(LTINSTALL) sqlite $(DESTDIR)$(exec_prefix)/bin
+	$(LTINSTALL) sqlite3 $(DESTDIR)$(exec_prefix)/bin
 	$(INSTALL) -d $(DESTDIR)$(prefix)/include
-	$(INSTALL) -m 0644 sqlite.h $(DESTDIR)$(prefix)/include
+	$(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(prefix)/include
 	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
 	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
 
 clean:	
-	rm -f *.lo *.la *.o sqlite@TARGET_EXEEXT@ libsqlite.la sqlite.h opcodes.*
+	rm -f *.lo *.la *.o sqlite3@TARGET_EXEEXT@ libsqlite3.la
+	rm -f sqlite3.h opcodes.*
 	rm -rf .libs .deps 
 	rm -f lemon@BUILD_EXEEXT@ lempar.c parse.* sqlite*.tar.gz
 	rm -f $(PUBLISH)
diff --git a/VERSION b/VERSION
index 5e03dc0a91..4a36342fca 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.0alpha
+3.0.0
diff --git a/manifest b/manifest
index d2680bc606..026f845dc1 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Fix\stypos\sand\sminor\serrors\sin\slang.tcl.\s(CVS\s1616)
-D 2004-06-18T11:25:21
-F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
+C Update\sthe\sMakefile.in,\sversion\snumber,\schange\slog,\setc\sfor\sthe\s3.0.0\nrelease.\s(CVS\s1617)
+D 2004-06-18T11:29:36
+F Makefile.in 5125bd6b92fca76275a6fc6c6ff425484b8cec0a
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
-F VERSION 4490ff094970c0e36eff0cbe2adcdb3a701f6ad6
+F VERSION 8c6981d7f982c3e2986fda2f34282264a4db344c
 F aclocal.m4 7daea4c35e88de30d5a3f6f7a2ab99720e803bbd
 F art/SQLite.eps 9b43cc99cfd2be687d386faea6862ea68d6a72b2
 F art/SQLite.gif 1bbb94484963f1382e27e1c5e86dd0c1061eba2b
@@ -195,7 +195,7 @@ F www/audit.tcl 90e09d580f79c7efec0c7d6f447b7ec5c2dce5c0
 F www/c_interface.tcl 2176519fc2bd2d2cf6fe74fd806fc2d8362de2c8
 F www/capi3.tcl 9e6a4b21f464d84b385dd5e78292880fc74a47ab
 F www/capi3ref.tcl 68a03fa5c15f01d04fbb073f8153078f1ba6f672
-F www/changes.tcl cbe942607b2b9e5dc995395f37042dbb5a629c7f
+F www/changes.tcl 4d75f4c2a8bba2bb26b0fd4f3a48999e06b4025f
 F www/common.tcl f786e6be86fb2627ceb30e770e9efa83b9c67a3a
 F www/conflict.tcl fb8a2ba83746c7fdfd9e52fa7f6aaf5c422b8246
 F www/copyright-release.html 294e011760c439c44951a6bfecd4c81a1ae359e8
@@ -204,7 +204,7 @@ F www/copyright.tcl 82c9670c7ddb0311912ab7fe24703f33c531066c
 F www/datatype3.tcl dadcd0b09dc6fdf86d0c38499e310ae94cb586d7
 F www/datatypes.tcl 566004b81c36877397ddbe6e1907aae6065f6b41
 F www/docs.tcl 095b5718ec044156af477061566ea25632624b56
-F www/download.tcl 075e21eb50ec6a3f29cdf2a011770a02187592eb
+F www/download.tcl 3868640b7a898df260ca3bb94c37e956fe0183d4
 F www/dynload.tcl 02eb8273aa78cfa9070dd4501dca937fb22b466c
 F www/faq.tcl 3a1776818d9bd973ab0c3048ec7ad6b1ad091ae5
 F www/fileformat.tcl f71a06a0d533c7df408539c64113b4adeaf29764
@@ -225,7 +225,7 @@ F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl f9a4c1a12864e129f6717d22313be01d5657e3aa
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 960f55f3ecbef4581c8cb7be860023ba10de4e96
-R a54f9360f1d233838325028d874d84d6
-U danielk1977
-Z dca5f137789ab1a1b476735e27fe6318
+P 61db159c7d1d971266e487d44e3eb5bf6ac9a8e3
+R e6fbb42a68049b9de9558297a2c68e0d
+U drh
+Z ecac902f72be9022c498944e0133e800
diff --git a/manifest.uuid b/manifest.uuid
index a034ae53c1..e80e21ddf7 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-61db159c7d1d971266e487d44e3eb5bf6ac9a8e3
\ No newline at end of file
+917391e05ef45fd1eae883a99e6bbe6d7df3cc1c
\ No newline at end of file
diff --git a/www/changes.tcl b/www/changes.tcl
index 7e54563425..25a1599ca3 100644
--- a/www/changes.tcl
+++ b/www/changes.tcl
@@ -9,7 +9,7 @@ This page provides a high-level summary of changes to SQLite.
 For more detail, refer the the checkin logs generated by
 CVS at
 <a href="http://www.sqlite.org/cvstrac/timeline">
-http:/www.sqlite.org/cvstrac/timeline</a>.
+http://www.sqlite.org/cvstrac/timeline</a>.
 </p>
 
 <DL>
@@ -21,6 +21,20 @@ proc chng {date desc} {
   puts "<DD><P><UL>$desc</UL></P></DD>"
 }
 
+chng {2004 June 18 (3.0.0 alpha)} {
+<li><font color="red"><b>
+    *** Alpha Release - Research And Testing Use Only ***</b></font>
+<li>Support for internationalization including UTF-8, UTF-16, and
+    user defined collating sequences.</li>
+<li>New file format that is 25% to 35% smaller for typical use.</li>
+<li>Improved concurrency.</li>
+<li>Atomic commits for ATTACHed databases.</li>
+<li>Remove cruft from the APIs.</li>
+<li>BLOB support.</li>
+<li>64-bit rowids.</li>
+<li><a href="version3.html">More information</a>.
+}
+
 chng {2004 June 9 (2.8.14)} {
 <li>Fix the min() and max() optimizer so that it works when the FROM
     clause consists of a subquery.</li>
diff --git a/www/download.tcl b/www/download.tcl
index 4ee2f8edaf..6f44d75bc4 100644
--- a/www/download.tcl
+++ b/www/download.tcl
@@ -1,7 +1,7 @@
 #
 # Run this TCL script to generate HTML for the download.html file.
 #
-set rcsid {$Id: download.tcl,v 1.9 2004/06/16 03:02:04 drh Exp $}
+set rcsid {$Id: download.tcl,v 1.10 2004/06/18 11:29:36 drh Exp $}
 source common.tcl
 header {SQLite Download Page}
 
@@ -26,6 +26,7 @@ proc Product {pattern desc} {
     puts "<td valign=\"top\">[string trim $d2]</td></tr>"
   }
 }
+cd doc
 
 proc Heading {title} {
   puts "<tr><td colspan=4><big><b>$title</b></big></td></tr>"
@@ -50,7 +51,6 @@ Product sqlite-VERSION.so.gz {
   <b>tclsqlite.so.gz</b> but without the TCL bindings.
 }
 
-cd doc
 Product sqlite-devel-VERSION-1.i386.rpm {
   RPM containing documentation, header files, and static library for
   SQLite version VERSION.
@@ -60,6 +60,11 @@ Product sqlite-VERSION-1.i386.rpm {
   program for SQLite version VERSION.
 }
 
+Product sqlite_analyzer-VERSION.bin.gz {
+  An analysis program for database files generated using SQLite version
+  2.8.14 and earlier.
+}
+
 Heading {Precompiled Binaries For Windows}
 
 Product sqlite-VERSION.zip {
@@ -76,6 +81,12 @@ Product sqlitedll-VERSION.zip {
   The only external dependency is MSVCRT.DLL.
 }
 
+Product sqlite_analyzer-VERSION.zip {
+  An analysis program for database files generated using SQLite version
+  VERSION.
+}
+
+
 Heading {Source Code}
 
 Product {sqlite-source-VERSION.zip} {