Change the name of the include file to "sqlite3.h". The names of the shell

command and static library become "sqlite3" and "libsqlite3.a". (CVS 1510)

FossilOrigin-Name: 4c37b6d2b78e88e2a9dfed4d764caeb0f626f92e

diff --git a/main.mk b/main.mk
index f3c6899ce376235789ced80fd6af8b43aa0de46f..7eacde21de462146d26f5db5c32f4dc26e87db38 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -128,7 +128,7 @@ TESTSRC = \
 # Header files used by all library source files.
 #
 HDR = \
-   sqlite.h  \
+   sqlite3.h  \
    $(TOP)/src/btree.h \
    config.h \
    $(TOP)/src/hash.h \
@@ -150,7 +150,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 config.h libsqlite.a sqlite$(EXE)
+all:   sqlite3.h config.h libsqlite3.a sqlite3$(EXE)
 
 # Generate the file "last_change" which contains the date of change
 # of the most recently modified source code file
@@ -159,13 +159,13 @@ last_change:      $(SRC)
        cat $(SRC) | grep '$$Id: ' | sort +4 | tail -1 \
           | awk '{print $$5,$$6}' >last_change
 
-libsqlite.a:   $(LIBOBJ)
-       $(AR) libsqlite.a $(LIBOBJ)
-       $(RANLIB) libsqlite.a
+libsqlite3.a:  $(LIBOBJ)
+       $(AR) libsqlite3.a $(LIBOBJ)
+       $(RANLIB) libsqlite3.a
 
-sqlite$(EXE):  $(TOP)/src/shell.c libsqlite.a sqlite.h
-       $(TCCX) $(READLINE_FLAGS) -o sqlite$(EXE) $(TOP)/src/shell.c \
-               libsqlite.a $(LIBREADLINE) $(THREADLIB)
+sqlite3$(EXE): $(TOP)/src/shell.c libsqlite3.a sqlite3.h
+       $(TCCX) $(READLINE_FLAGS) -o sqlite3$(EXE) $(TOP)/src/shell.c \
+               libsqlite3.a $(LIBREADLINE) $(THREADLIB)
 
 objects: $(LIBOBJ_ORIG)
 
@@ -294,10 +294,10 @@ random.o: $(TOP)/src/random.c $(HDR)
 select.o:      $(TOP)/src/select.c $(HDR)
        $(TCCX) -c $(TOP)/src/select.c
 
-sqlite.h:      $(TOP)/src/sqlite.h.in 
+sqlite3.h:     $(TOP)/src/sqlite.h.in 
        sed -e s/--VERS--/`cat ${TOP}/VERSION`/ \
             -e s/--ENCODING--/$(ENCODING)/ \
-                 $(TOP)/src/sqlite.h.in >sqlite.h
+                 $(TOP)/src/sqlite.h.in >sqlite3.h
 
 table.o:       $(TOP)/src/table.c $(HDR)
        $(TCCX) -c $(TOP)/src/table.c
@@ -340,19 +340,19 @@ where.o:  $(TOP)/src/where.c $(HDR)
 
 # Rules for building test programs and for running tests
 #
-tclsqlite:     $(TOP)/src/tclsqlite.c libsqlite.a
-       $(TCCX) $(TCL_FLAGS) -DTCLSH=1 -o tclsqlite \
-               $(TOP)/src/tclsqlite.c libsqlite.a $(LIBTCL)
+tclsqlite3:    $(TOP)/src/tclsqlite.c libsqlite3.a
+       $(TCCX) $(TCL_FLAGS) -DTCLSH=1 -o tclsqlite3 \
+               $(TOP)/src/tclsqlite.c libsqlite3.a $(LIBTCL)
 
-testfixture$(EXE):     $(TOP)/src/tclsqlite.c libsqlite.a $(TESTSRC)
+testfixture$(EXE):     $(TOP)/src/tclsqlite.c libsqlite3.a $(TESTSRC)
        $(TCCX) $(TCL_FLAGS) -DTCLSH=1 -DSQLITE_TEST=1 -o testfixture$(EXE) \
                $(TESTSRC) $(TOP)/src/tclsqlite.c \
-               libsqlite.a $(LIBTCL) $(THREADLIB)
+               libsqlite3.a $(LIBTCL) $(THREADLIB)
 
-fulltest:      testfixture$(EXE) sqlite$(EXE)
+fulltest:      testfixture$(EXE) sqlite3$(EXE)
        ./testfixture$(EXE) $(TOP)/test/all.test
 
-test:  testfixture$(EXE) sqlite$(EXE)
+test:  testfixture$(EXE) sqlite3$(EXE)
        ./testfixture$(EXE) $(TOP)/test/quick.test
 
 # Rules used to build documentation
@@ -366,6 +366,9 @@ arch.png:   $(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
+
 changes.html:  $(TOP)/www/changes.tcl
        tclsh $(TOP)/www/changes.tcl >changes.html
 
@@ -387,6 +390,9 @@ conflict.html:      $(TOP)/www/conflict.tcl
 datatypes.html:        $(TOP)/www/datatypes.tcl
        tclsh $(TOP)/www/datatypes.tcl >datatypes.html
 
+datatype3.html:        $(TOP)/www/datatype3.tcl
+       tclsh $(TOP)/www/datatype3.tcl >datatype3.html
+
 docs.html:     $(TOP)/www/docs.tcl
        tclsh $(TOP)/www/docs.tcl >docs.html
 
@@ -447,13 +453,15 @@ vdbe.html:        $(TOP)/www/vdbe.tcl
 DOC = \
   arch.html \
   arch.png \
-  changes.html \
   c_interface.html \
+  capi3.html \
+  changes.html \
   copyright.html \
   copyright-release.html \
   copyright-release.pdf \
   conflict.html \
   datatypes.html \
+  datatype3.html \
   docs.html \
   download.html \
   faq.html \
@@ -479,13 +487,13 @@ doc:      common.tcl $(DOC)
 
 # Standard install and cleanup targets
 #
-install:       sqlite libsqlite.a sqlite.h
-       mv sqlite /usr/bin
-       mv libsqlite.a /usr/lib
-       mv sqlite.h /usr/include
+install:       sqlite3 libsqlite3.a sqlite3.h
+       mv sqlite3 /usr/bin
+       mv libsqlite3.a /usr/lib
+       mv sqlite3.h /usr/include
 
 clean: 
-       rm -f *.o sqlite libsqlite.a sqlite.h opcodes.*
+       rm -f *.o sqlite3 libsqlite3.a sqlite3.h opcodes.*
        rm -f lemon lempar.c parse.* sqlite*.tar.gz
        rm -f $(PUBLISH)
        rm -f *.da *.bb *.bbg gmon.out

diff --git a/manifest b/manifest
index 6fdb2bd43b74b571f2e591c1eab499c99d6ae504..1eb554fbc4c7ce6ef5574257ddda6b4f2275ce37 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Begin\sadding\sdocumentation\sfor\sversion\s3.0.\s(CVS\s1509)
-D 2004-05-31T18:22:26
+C Change\sthe\sname\sof\sthe\sinclude\sfile\sto\s"sqlite3.h".\s\sThe\snames\sof\sthe\sshell\ncommand\sand\sstatic\slibrary\sbecome\s"sqlite3"\sand\s"libsqlite3.a".\s(CVS\s1510)
+D 2004-05-31T18:23:08
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -16,7 +16,7 @@ F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh f6b283068efa69f06eb8aa1fe4bddfdbdeb35826
-F main.mk 37fbea48aaddd86249e10bc9f20e2151695e2037
+F main.mk 63b5680a8103b46481898d71c1c259b9f34e144a
 F publish.sh 1cd5c982388560fa91eedf6a338e210f713b35c8
 F spec.template a38492f1c1dd349fc24cb0565e08afc53045304b
 F sqlite.1 83f4a9d37bdf2b7ef079a82d54eaf2e3509ee6ea
@@ -37,7 +37,7 @@ F src/hash.h 762d95f1e567664d1eafc1687de755626be962fb
 F src/insert.c 4268d9e3959cc845ea243fb4ec7507269404dad9
 F src/legacy.c ad23746f15f67e34577621b1875f639c94839e1f
 F src/main.c 9bb9578c15db0205616fcf474885b83aba53d910
-F src/md5.c d2c738fedfb27f73cefcf2b0ac1f9f21894b073e
+F src/md5.c 4302e84ae516c616bb079c4e6d038c0addb33481
 F src/os.h ab42f4a7c4c716f26b988e759b6e12085a3bfc67
 F src/os_common.h 744286a27de55c52f1b18921e8d17abbf7fafc0f
 F src/os_mac.c b823874690615ace0dd520d3ad1fe8bfd864b7e0
@@ -53,9 +53,9 @@ F src/pragma.c 7f432dee3c94460638df1e5fffeb59a560943d13
 F src/printf.c ef750e8e2398ca7e8b58be991075f08c6a7f0e53
 F src/random.c eff68e3f257e05e81eae6c4d50a51eb88beb4ff3
 F src/select.c 0297717eb7331604687c2e29c147d3a311359df1
-F src/shell.c ed4d237b3e52a0a42512bfcc53530e46de20c28f
+F src/shell.c b71bdc3586c1c254941a236f3461615fd032eab1
 F src/sqlite.h.in edc6408c7f53c2104f781a76b926036e17018ec9
-F src/sqliteInt.h 4a153e6c57eda3dfbfe190ac66986bc765a2c351
+F src/sqliteInt.h de20432992233b394a7fc80458f03d7cb7138bc5
 F src/table.c af14284fa36c8d41f6829e3f2819dce07d3e2de2
 F src/tclsqlite.c b314f12760547e4ef090e055f1298f70627450d3
 F src/test1.c 32934478366531503d634968db414df17cb38238
@@ -212,7 +212,7 @@ F www/support.tcl 67682848d6ddd283370451dc3da2e56cded9fc9a
 F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 48226a73801bc478d6fd6de5a554aec5119d2194
-R 6c1a6ec8dae26e3de7139bd0ba98440c
+P 2005bfdad03ac2aa70a82ba7ff9b2f469d129367
+R 783e591d80614a85072d6745be4be04f
 U drh
-Z dd522c4899d9ea1abb58bb871bde4c24
+Z bb28014f004f9d7fe5e7794b01035f95

diff --git a/manifest.uuid b/manifest.uuid
index d5c081aac66877c18b34e5a6e84f1f645021a2b2..977601f304813d4cdcad0a94e3ce16916de3c597 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2005bfdad03ac2aa70a82ba7ff9b2f469d129367
\ No newline at end of file
+4c37b6d2b78e88e2a9dfed4d764caeb0f626f92e
\ No newline at end of file

diff --git a/src/md5.c b/src/md5.c
index a5b279157c1fec8e5d573385bda82c0a1d9a2d47..72f9ef492281d703ad7f0ff34fbd9802f5d1f5b6 100644 (file)
--- a/src/md5.c
+++ b/src/md5.c
@@ -30,7 +30,7 @@
  */
 #include <tcl.h>
 #include <string.h>
-#include "sqlite.h"
+#include "sqlite3.h"
 
 /*
  * If compiled on a machine that doesn't have a 32-bit integer,

diff --git a/src/shell.c b/src/shell.c
index 5c0a37a8f477de0584df488ccabab69d2297b7ab..0c6c9afba5f6ff9e844010860b5b3bf4ee747a0c 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -12,12 +12,12 @@
 ** This file contains code to implement the "sqlite" command line
 ** utility for accessing SQLite databases.
 **
-** $Id: shell.c,v 1.98 2004/05/24 07:04:26 danielk1977 Exp $
+** $Id: shell.c,v 1.99 2004/05/31 18:23:08 drh Exp $
 */
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include "sqlite.h"
+#include "sqlite3.h"
 #include <ctype.h>
 
 #if !defined(_WIN32) && !defined(WIN32) && !defined(__MACOS__)
@@ -1349,6 +1349,3 @@ int main(int argc, char **argv){
   if( db ) sqlite3_close(db);
   return 0;
 }
-
-
-

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 105ac4a68ae3f62e97dfdb16f4f58dee4639ff2f..c0ef83e15027bf799dfc77ba385c7a7a45c73dd2 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,10 +11,10 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.263 2004/05/31 08:55:34 danielk1977 Exp $
+** @(#) $Id: sqliteInt.h,v 1.264 2004/05/31 18:23:09 drh Exp $
 */
 #include "config.h"
-#include "sqlite.h"
+#include "sqlite3.h"
 #include "hash.h"
 #include "parse.h"
 #include <stdio.h>