From 611c8caec322b8813d3191f7634a6bce7a3965a4 Mon Sep 17 00:00:00 2001 From: drh Date: Mon, 2 Apr 2007 15:04:34 +0000 Subject: [PATCH] Update the build scripts and the homepage in preparation for version 3.3.14. (CVS 3797) FossilOrigin-Name: a154224b329423aef622be539f6e7dfb76dc4c21 --- manifest | 18 +++++++++--------- manifest.uuid | 2 +- mkdll.sh | 31 +++++++++++++------------------ publish.sh | 48 +++++++++++++++++++++++++++--------------------- www/index.tcl | 23 ++++++++++++++++++++--- 5 files changed, 70 insertions(+), 52 deletions(-) diff --git a/manifest b/manifest index 67a5759c75..92e6e8cd90 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Cover\san\sextra\scase\sin\ssqlite3PagerMovepage().\s(CVS\s3796) -D 2007-04-02T14:19:16 +C Update\sthe\sbuild\sscripts\sand\sthe\shomepage\sin\spreparation\sfor\sversion\s3.3.14.\s(CVS\s3797) +D 2007-04-02T15:04:34 F Makefile.in 2f2c3bf69faf0ae7b8e8af4f94f1986849034530 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -44,11 +44,11 @@ F ext/fts2/fts2_tokenizer1.c 6067f2f710bc7e91c0688b7b11be1027777553e0 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 F ltmain.sh 56abb507100ed2d4261f6dd1653dec3cf4066387 F main.mk 49c1b97b57d2a0091fbecee6feb9a992661ff05a -F mkdll.sh cbc7d92d02f9317a3d24ab55bb727275417260ca +F mkdll.sh ed62756baf44babf562a7843588790c02fee2106 F mkopcodec.awk bd46ad001c98dfbab07b1713cb8e692fa0e5415d F mkopcodeh.awk cde995d269aa06c94adbf6455bea0acedb913fa5 F mkso.sh 24bde4c09e6fe80f718db3c31c068f45e13a2f2c -F publish.sh 0803a2952107454d3eaf2e239bd6699951ecfbab +F publish.sh 8ef26af8417ddd03d471779e9c14764b3abe7706 F spec.template b2f6c4e488cbc3b993a57deba22cbc36203c4da3 F sqlite.pc.in 30552343140c53304c2a658c080fbe810cd09ca2 F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc @@ -424,7 +424,7 @@ F www/fileformat.tcl 900c95b9633abc3dcfc384d9ddd8eb4876793059 F www/formatchng.tcl bbb8af1ee494a71031acac4c8d8c51535f23b9df F www/fullscanb.gif f7c94cb227f060511f8909e10f570157263e9a25 F www/index-ex1-x-b.gif f9b1d85c3fa2435cf38b15970c7e3aa1edae23a3 -F www/index.tcl 688cf1280232f4964d8d07fda65e166a4b2e16cc +F www/index.tcl ac28cf2f1130bedf970f990546d0ec79d2e9fbfc F www/indirect1b1.gif adfca361d2df59e34f9c5cac52a670c2bfc303a1 F www/lang.tcl dc4dedf00d2d6c46a17a962f850fc82086accb5c F www/lockingv3.tcl e52345bd20323bef6146bfce18ae0829b2b7c87d @@ -448,7 +448,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 -P c036db6251ca4671fc3388a4f37955c18adeca1d -R b312892bc4400eb87f0210f0a4ec2915 -U danielk1977 -Z 42486ade40db0dea35717849aebedc28 +P 7313688bd03141381067c36800edf1621a2ea05e +R 83120205a98e03024248d114ac0707a7 +U drh +Z e1fb66c85dcd79e9a1eb2aceb9090af2 diff --git a/manifest.uuid b/manifest.uuid index c3b8265540..6304022d4e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7313688bd03141381067c36800edf1621a2ea05e \ No newline at end of file +a154224b329423aef622be539f6e7dfb76dc4c21 \ No newline at end of file diff --git a/mkdll.sh b/mkdll.sh index 56ecb7ce31..ecb822550f 100644 --- a/mkdll.sh +++ b/mkdll.sh @@ -6,22 +6,21 @@ # library. "tclsqlite3.dll" contains the TCL bindings and is the # library that is loaded into TCL in order to run SQLite. # -make target_source -cd tsrc +make sqlite3.c PATH=$PATH:/opt/mingw/bin TCLDIR=/home/drh/tcltk/846/win/846win TCLSTUBLIB=$TCLDIR/libtcl84stub.a -OPTS='-DUSE_TCL_STUBS=1 -DNDEBUG=1 -DTHREADSAFE=1 -DBUILD_sqlite=1' -CC="i386-mingw32msvc-gcc -O2 $OPTS -I. -I$TCLDIR" +OPTS='-DUSE_TCL_STUBS=1 -DTHREADSAFE=1 -DBUILD_sqlite=1 -DOS_WIN=1' +CC="i386-mingw32msvc-gcc -O2 $OPTS -Itsrc -I$TCLDIR" NM="i386-mingw32msvc-nm" -rm shell.c -for i in *.c; do - CMD="$CC -c $i" - echo $CMD - $CMD -done +CMD="$CC -c sqlite3.c" +echo $CMD +$CMD +CMD="$CC -c tsrc/tclsqlite.c -o tclsqlite.o" +echo $CMD +$CMD echo 'EXPORTS' >tclsqlite3.def -$NM *.o | grep ' T ' >temp1 +$NM sqlite3.o tclsqlite.o | grep ' T ' >temp1 grep '_Init$' temp1 >temp2 grep '_SafeInit$' temp1 >>temp2 grep ' T _sqlite3_' temp1 >>temp2 @@ -33,10 +32,8 @@ i386-mingw32msvc-dllwrap \ --dlltool-name i386-mingw32msvc-dlltool \ --as i386-mingw32msvc-as \ --target i386-mingw32 \ - -dllname tclsqlite3.dll -lmsvcrt *.o $TCLSTUBLIB -#i386-mingw32msvc-strip tclsqlite3.dll -rm tclsqlite.o -$NM *.o | grep ' T ' >temp1 + -dllname tclsqlite3.dll -lmsvcrt tclsqlite.o sqlite3.o $TCLSTUBLIB +$NM sqlite3.o | grep ' T ' >temp1 echo 'EXPORTS' >sqlite3.def grep ' _sqlite3_' temp1 | sed 's/^.* _//' >>sqlite3.def i386-mingw32msvc-dllwrap \ @@ -45,6 +42,4 @@ i386-mingw32msvc-dllwrap \ --dlltool-name i386-mingw32msvc-dlltool \ --as i386-mingw32msvc-as \ --target i386-mingw32 \ - -dllname sqlite3.dll -lmsvcrt *.o -#i386-mingw32msvc-strip sqlite3.dll -cd .. + -dllname sqlite3.dll -lmsvcrt sqlite3.o diff --git a/publish.sh b/publish.sh index 043c89a039..d9cdcaecbc 100644 --- a/publish.sh +++ b/publish.sh @@ -20,55 +20,61 @@ chmod +x $srcdir/install-sh # VERS=`cat $srcdir/VERSION` VERSW=`sed 's/\./_/g' $srcdir/VERSION` +echo "VERSIONS: $VERS $VERSW" # Start by building an sqlite shell for linux. # make clean -make sqlite3 +make sqlite3.c +gcc -O2 -Itsrc sqlite3.c tsrc/shell.c -o sqlite3 -ldl -lpthread strip sqlite3 mv sqlite3 sqlite3-$VERS.bin gzip sqlite3-$VERS.bin +chmod 644 sqlite3-$VERS.bin.gz mv sqlite3-$VERS.bin.gz doc # Build a source archive useful for windows. # -make target_source -cd tsrc -zip ../doc/sqlite-source-$VERSW.zip * -cd .. +make sqlite3.c +cp tsrc/sqlite3.h . +pwd +zip doc/sqlite-source-$VERSW.zip sqlite3.c sqlite3.h # Build the sqlite.so and tclsqlite.so shared libraries # under Linux # -. $srcdir/mkso.sh -cd tsrc +make sqlite3.c +TCLDIR=/home/drh/tcltk/846/linux/846linux +TCLSTUBLIB=$TCLDIR/libtclstub8.4g.a +gcc -O2 -shared -Itsrc sqlite3.c tsrc/tclsqlite.c $TCLSTUBLIB -o tclsqlite3.so +strip tclsqlite3.so +chmod 644 tclsqlite3.so mv tclsqlite3.so tclsqlite-$VERS.so gzip tclsqlite-$VERS.so -mv tclsqlite-$VERS.so.gz ../doc +mv tclsqlite-$VERS.so.gz doc +gcc -O2 -shared -Itsrc sqlite3.c -o sqlite3.so +strip sqlite3.so +chmod 644 sqlite3.so mv sqlite3.so sqlite-$VERS.so gzip sqlite-$VERS.so -mv sqlite-$VERS.so.gz ../doc -cd .. +mv sqlite-$VERS.so.gz doc + # Build the tclsqlite3.dll and sqlite3.dll shared libraries. # . $srcdir/mkdll.sh -cd tsrc -echo zip ../doc/tclsqlite-$VERSW.zip tclsqlite3.dll -zip ../doc/tclsqlite-$VERSW.zip tclsqlite3.dll -echo zip ../doc/sqlitedll-$VERSW.zip sqlite3.dll sqlite3.def -zip ../doc/sqlitedll-$VERSW.zip sqlite3.dll sqlite3.def -cd .. +echo zip doc/tclsqlite-$VERSW.zip tclsqlite3.dll +zip doc/tclsqlite-$VERSW.zip tclsqlite3.dll +echo zip doc/sqlitedll-$VERSW.zip sqlite3.dll sqlite3.def +zip doc/sqlitedll-$VERSW.zip sqlite3.dll sqlite3.def # Build the sqlite.exe executable for windows. # make target_source -cd tsrc -rm tclsqlite.c OPTS='-DSTATIC_BUILD=1 -DNDEBUG=1' -i386-mingw32msvc-gcc -O2 $OPTS -I. -I$TCLDIR *.c -o sqlite3.exe -zip ../doc/sqlite-$VERSW.zip sqlite3.exe -cd .. +i386-mingw32msvc-gcc -O2 $OPTS -Itsrc -I$TCLDIR sqlite3.c tsrc/shell.c \ + -o sqlite3.exe +zip doc/sqlite-$VERSW.zip sqlite3.exe # Construct a tarball of the source tree # diff --git a/www/index.tcl b/www/index.tcl index afff6ba5d1..6856e46ec4 100644 --- a/www/index.tcl +++ b/www/index.tcl @@ -31,7 +31,9 @@ Features include: (241 bytes) in size.
  • Strings and BLOBs up to 2 gibibytes (231 bytes) in size.
  • -
  • Small code footprint: less than 250KiB fully configured or less +
  • Small code footprint: + + less than 250KiB fully configured or less than 150KiB with optional features omitted.
  • Faster than popular client/server database engines for most common operations.
  • @@ -40,7 +42,11 @@ Features include: Bindings for many other languages available separately. -
  • Well-commented source code with over 95% test coverage.
  • +
  • Well-commented source code with over 97% test coverage.
  • +
  • Available as a + + single ANSI-C source-code file that you can easily drop into + another project.
  • Self-contained: no external dependencies.
  • Sources are in the public domain. Use for any purpose.
  • @@ -67,6 +73,17 @@ proc newsitem {date title text} { puts "
    " } +newsitem {2007-Apr-02} {Version 3.3.14} { + This version focuses on performance improvements. If you recompile + + the amalgamation using GCC option -O3 (the precompiled binaries + use -O2) you may see performance + improvements of 35% or more over version 3.3.13 depending on your + workload. This version also + adds support for + exclusive access mode. +} + newsitem {2007-Feb-13} {Version 3.3.13} { This version fixes a subtle bug in the ORDER BY optimizer that can occur when using joins. There are also a few minor enhancements. @@ -96,4 +113,4 @@ puts {

    Old news...

    } -footer {$Id: index.tcl,v 1.150 2007/02/13 02:03:24 drh Exp $} +footer {$Id: index.tcl,v 1.151 2007/04/02 15:04:34 drh Exp $}