Add a numeric version number. Ticket #1097. (CVS 2315)

FossilOrigin-Name: a9c33a804d572dd9df15be2029637b10e5a65cc4

diff --git a/Makefile.in b/Makefile.in
index a01637237853ca8d845601f2ab7cb3473bdb3ec9..d8f84d2216d3089f32850580898c89791decb682 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -69,6 +69,7 @@ TEMP_STORE = -DTEMP_STORE=@TEMP_STORE@
 # Version numbers and release number for the SQLite being compiled.
 #
 VERSION = @VERSION@
+VERSION_NUMBER = @VERSION_NUMBER@
 RELEASE = @RELEASE@
 
 # Filename extensions
@@ -351,7 +352,8 @@ select.lo:  $(TOP)/src/select.c $(HDR)
        $(LTCOMPILE) -c $(TOP)/src/select.c
 
 sqlite3.h:     $(TOP)/src/sqlite.h.in 
-       sed -e s/--VERS--/$(RELEASE)/ $(TOP)/src/sqlite.h.in >sqlite3.h
+       sed -e s/--VERS--/$(RELEASE)/ $(TOP)/src/sqlite.h.in | \
+       sed -e s/--VERSION-NUMBER--/$(VERSION_NUMBER)/ >sqlite3.h
 
 table.lo:      $(TOP)/src/table.c $(HDR)
        $(LTCOMPILE) -c $(TOP)/src/table.c

diff --git a/configure b/configure
index 843cf0b5ce4bfb94cc0d661882c3777c237d17cc..ca692ae91c214d6aeee0a83944ddea9a5e2f8c09 100755 (executable)
--- a/configure
+++ b/configure
@@ -463,7 +463,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA program_prefix VERSION RELEASE BUILD_CC BUILD_CFLAGS BUILD_LIBS TARGET_CC TARGET_CFLAGS TARGET_LINK TARGET_LFLAGS TARGET_RANLIB TARGET_AR THREADSAFE TARGET_THREAD_LIB ALLOWRELEASE TEMP_STORE BUILD_EXEEXT OS_UNIX OS_WIN TARGET_EXEEXT TARGET_LIBS TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIBS TCL_INCLUDE_SPEC TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC HAVE_TCL TARGET_READLINE_LIBS TARGET_READLINE_INC TARGET_HAVE_READLINE TARGET_DEBUG LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA program_prefix VERSION VERSION_NUMBER RELEASE BUILD_CC BUILD_CFLAGS BUILD_LIBS TARGET_CC TARGET_CFLAGS TARGET_LINK TARGET_LFLAGS TARGET_RANLIB TARGET_AR THREADSAFE TARGET_THREAD_LIB ALLOWRELEASE TEMP_STORE BUILD_EXEEXT OS_UNIX OS_WIN TARGET_EXEEXT TARGET_LIBS TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIBS TCL_INCLUDE_SPEC TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC HAVE_TCL TARGET_READLINE_LIBS TARGET_READLINE_INC TARGET_HAVE_READLINE TARGET_DEBUG LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1496,7 +1496,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 # The following RCS revision string applies to configure.in
-# $Revision: 1.29 $
+# $Revision: 1.30 $
 
 #########
 # Programs needed
@@ -18429,6 +18429,11 @@ echo "Version set to $VERSION"
 RELEASE=`cat $srcdir/VERSION`
 echo "Release set to $RELEASE"
 
+VERSION_NUMBER=`cat $srcdir/VERSION  \
+               | sed 's/[^0-9]/ /g' \
+                | awk '{printf "%d%03d%03d",$1,$2,$3}'`
+
+echo "Version number set to $VERSION_NUMBER"
 
 #########
 # Check to see if the --with-hints=FILE option is used.  If there is none,
@@ -21013,6 +21018,7 @@ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
 s,@program_prefix@,$program_prefix,;t t
 s,@VERSION@,$VERSION,;t t
+s,@VERSION_NUMBER@,$VERSION_NUMBER,;t t
 s,@RELEASE@,$RELEASE,;t t
 s,@BUILD_CC@,$BUILD_CC,;t t
 s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t

diff --git a/main.mk b/main.mk
index e28ac15a14274a9e30d4f4320742ede9f1236e17..6f0fcac2d22eae235d06ca24608ad535af9d329e 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -288,7 +288,7 @@ select.o:   $(TOP)/src/select.c $(HDR)
 
 sqlite3.h:     $(TOP)/src/sqlite.h.in 
        sed -e s/--VERS--/`cat ${TOP}/VERSION`/ \
-            -e s/--ENCODING--/$(ENCODING)/ \
+           -e s/--VERSION-NUMBER--/`cat ${TOP}/VERSION | sed 's/[^0-9]/ /g' | awk '{printf "%d%03d%03d",$$1,$$2,$$3}'`/ \
                  $(TOP)/src/sqlite.h.in >sqlite3.h
 
 table.o:       $(TOP)/src/table.c $(HDR)

diff --git a/manifest b/manifest
index 3f41144d709c9dabaf754ff937ed71e04d431ec5..54ba63629000c0071bbc1bf0124e96cea0b66332 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
-C Detect\sdatabase\scorruption\sin\srootpage\sflags\s(see\salso\s(2313)).\s(CVS\s2314)
-D 2005-02-05T06:49:54
-F Makefile.in f867ff4c3353a3b10ecf823f338876a47fc7def0
+C Add\sa\snumeric\sversion\snumber.\sTicket\s#1097.\s(CVS\s2315)
+D 2005-02-05T07:33:34
+F Makefile.in d928187101fa3d78426cf48ca30e39d0fb714e57
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
 F VERSION 6755bb368f6ab4bda43b635142309ce2681506cf
@@ -10,13 +10,13 @@ F art/SQLite.gif 1bbb94484963f1382e27e1c5e86dd0c1061eba2b
 F art/SQLiteLogo3.tiff b9e6bf022ae939bc986cddb8ab99583ca1b02cb3
 F config.guess 2103e94b15dc57112d7b9ee152c6fac5288895b4
 F config.sub 9bf686ec001ae7bc53f5b3563c90c62d4c6d48be
-F configure e9cfc464d78f31fb3150b18a0e0439841996e5e6 x
+F configure ae39c037bbd1fad89d87a89c505d012b975e9f97 x
 F configure.ac a3e521f42b4352215c2499bc2a7138b076d30c59
 F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh f6b283068efa69f06eb8aa1fe4bddfdbdeb35826
-F main.mk a31a2d01af035f18db539e5d9ce0629b2f7616e3
+F main.mk 834d5f2feb8d0f79fb3d2bb9db5afac2b3da7349
 F mkdll.sh 468d4f41d3ea98221371df4825cfbffbaac4d7e4
 F mkopcodec.awk bd46ad001c98dfbab07b1713cb8e692fa0e5415d
 F mkopcodeh.awk cc36b29ff7c996cc482f91a6fd3fa33297b075d5
@@ -41,7 +41,7 @@ F src/hash.c 2b1b13f7400e179631c83a1be0c664608c8f021f
 F src/hash.h 1b0c445e1c89ff2aaad9b4605ba61375af001e84
 F src/insert.c 6ab596846d52bd63d6227f9128a29e4f5b2cf524
 F src/legacy.c d58ea507bce885298a2c8c3cbb0f4bff5d47830b
-F src/main.c de1f29d3c3cdfbced0c38b40d65541cda76c6799
+F src/main.c 75e70f15b4e22bf69f84c77fb80d6a8f0b0836eb
 F src/md5.c 7ae1c39044b95de2f62e066f47bb1deb880a1070
 F src/os.h ae44064dc118b20d39450cb331409a775e8bb1c6
 F src/os_common.h 0e7f428ba0a6c40a61bc56c4e96f493231301b73
@@ -59,7 +59,7 @@ F src/printf.c 3d20b21cfecadacecac3fb7274e746cb81d3d357
 F src/random.c eff68e3f257e05e81eae6c4d50a51eb88beb4ff3
 F src/select.c 16c750c000f0d6aa543c778e2c752154b7272336
 F src/shell.c 3cb0ef124ed9cd582ce89aec59ff7c659bc6e61b
-F src/sqlite.h.in 2a2cb0131cdbd3fe2082de3261efe0ef002e6816
+F src/sqlite.h.in c85f6bad9ca7de29f505fe886646cfff7df4c55e
 F src/sqliteInt.h f10da39b6407af63002401c7f9cee4a1313f4d2d
 F src/table.c 25b3ff2b39b7d87e8d4a5da0713d68dfc06cbee9
 F src/tclsqlite.c 101994a2c4c0eaa69f1de9bfe4a02167f6049e7d
@@ -270,7 +270,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl 3e522a06ad41992023c80ca29a048ae2331ca5bd
-P 9fc0a5cbf892a22eaa950f3b2ed572ab4985c220
-R 8a70ee41a498a441e9c9ad827e56edad
+P 6d91a1e91bf0e8b4a0f5f78d079031f3ee69603b
+R 752d291cdd1da93d3f1d71a58abca891
 U danielk1977
-Z 7ca8eabd20bbe1e17778cf54c5cd6f57
+Z bc43e9a2df7fa6f5203156118f2ad652

diff --git a/manifest.uuid b/manifest.uuid
index bde471c054bb12c2cb3e7f7da27d6f662514e032..3759aeea8c8daf49ae0f5f1bb9ecf97ad19b6d44 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6d91a1e91bf0e8b4a0f5f78d079031f3ee69603b
\ No newline at end of file
+a9c33a804d572dd9df15be2029637b10e5a65cc4
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 728e6489a5aa8565fc2138f9da6f08ee39f609a0..51608cc81efdad8e379c87d28388d108a89c39ef 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.278 2005/02/04 04:07:17 danielk1977 Exp $
+** $Id: main.c,v 1.279 2005/02/05 07:33:34 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -373,6 +373,7 @@ int sqlite3ReadSchema(Parse *pParse){
 const char rcsid3[] = "@(#) \044Id: SQLite version " SQLITE_VERSION " $";
 const char sqlite3_version[] = SQLITE_VERSION;
 const char *sqlite3_libversion(void){ return sqlite3_version; }
+int sqlite3_libversion_number(void){ return SQLITE_VERSION_NUMBER; }
 
 /*
 ** This is the default collating function named "BINARY" which is always

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 76789efbf6aede849d6bbf862480ad5a1f6a3843..430bd2cf1165ab914386e659cb2fc938dd22bd18 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -12,7 +12,7 @@
 ** This header file defines the interface that the SQLite library
 ** presents to client programs.
 **
-** @(#) $Id: sqlite.h.in,v 1.129 2005/02/02 01:13:38 danielk1977 Exp $
+** @(#) $Id: sqlite.h.in,v 1.130 2005/02/05 07:33:35 danielk1977 Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
@@ -30,9 +30,25 @@ extern "C" {
 */
 #ifdef SQLITE_VERSION
 # undef SQLITE_VERSION
-#else
-# define SQLITE_VERSION         "--VERS--"
 #endif
+#define SQLITE_VERSION         "--VERS--"
+
+/*
+** The format of the version string is "X.Y.Z<trailing string>", where
+** X is the major version number, Y is the minor version number and Z
+** is the release number. The trailing string is often "alpha" or "beta".
+** For example "3.1.1beta".
+**
+** The SQLITE_VERSION_NUMBER is an integer with the value 
+** (X*100000 + Y*1000 + Z). For example, for version "3.1.1beta", 
+** SQLITE_VERSION_NUMBER is set to 3001001. To detect if they are using 
+** version 3.1.1 or greater at compile time, programs may use the test 
+** (SQLITE_VERSION_NUMBER>=3001001).
+*/
+#ifdef SQLITE_VERSION_NUMBER
+# undef SQLITE_VERSION_NUMBER
+#endif
+#define SQLITE_VERSION_NUMBER --VERSION-NUMBER--
 
 /*
 ** The version string is also compiled into the library so that a program
@@ -44,6 +60,12 @@ extern "C" {
 extern const char sqlite3_version[];
 const char *sqlite3_libversion(void);
 
+/*
+** Return the value of the SQLITE_VERSION_NUMBER macro when the
+** library was compiled.
+*/
+int sqlite3_libversion_number(void);
+
 /*
 ** Each open sqlite database is represented by an instance of the
 ** following opaque structure.