Update the "publish.sh" scripts used to build the binaries for the website. (CVS...

FossilOrigin-Name: 2f748318fbb8ac4614c07629506b3955ce4fe20d

diff --git a/manifest b/manifest
index cc506d2deb1c0f4217b0d727654550c5bf3c6e28..e32a8e62056983a5865b4570770d0e46ec6c048d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.5.3\s(CVS\s4566)
-D 2007-11-27T17:12:11
+C Update\sthe\s"publish.sh"\sscripts\sused\sto\sbuild\sthe\sbinaries\sfor\sthe\swebsite.\s(CVS\s4567)
+D 2007-11-27T17:38:14
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 35396fd58890420b29edcf27b6c0e2d054862a6b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -65,13 +65,13 @@ F ext/icu/icu.c 61a345d8126686aa3487aa8d2d0f68abd655f7a4
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh 56abb507100ed2d4261f6dd1653dec3cf4066387
 F main.mk 297e32b77abde73e5638e048d474a86617bc40af
-F mkdll.sh 37fa8a7412e51b5ab2bc6d4276135f022a0feffb
+F mkdll.sh bb631e62bfa5a44082d755fa43445c7f495be8c2
 F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
 F mkextw.sh 1a866b53637dab137191341cc875575a5ca110fb
 F mkopcodec.awk 3fb9bf077053c968451f4dd03d11661ac373f9d1
 F mkopcodeh.awk 799a299eaf3173c0f8ac0bd7c4b49c0f4d4590ca
 F mkso.sh 24bde4c09e6fe80f718db3c31c068f45e13a2f2c
-F publish.sh 873d7b1e4f3bb3ca9286d9e693c43dd7ba820d30
+F publish.sh 4e1b331bd7f7b6a8d8a9db2a84e3d673ff66f299
 F spec.template b2f6c4e488cbc3b993a57deba22cbc36203c4da3
 F sqlite.pc.in 30552343140c53304c2a658c080fbe810cd09ca2
 F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
@@ -592,7 +592,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P eeec8d27c4533f62b4f7e739d9c895552ddb69ff
-R 089796694c6a301d0c6f684ee346f02f
+P a39007d5b1f0d8925153ab3aac44fd655ed2536e
+R f5c5c3293e010309c707626336f36efd
 U drh
-Z 3a6026fe696ffecc89234d8c06bf6ef2
+Z d749c1e822fb8933641979eabff7aa02

diff --git a/manifest.uuid b/manifest.uuid
index 0cc91f31e78b452800d52717f34d91c15fdf84e9..e4ec69b15f3e17e4b41addc24f3cc26f7afd3dbb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a39007d5b1f0d8925153ab3aac44fd655ed2536e
\ No newline at end of file
+2f748318fbb8ac4614c07629506b3955ce4fe20d
\ No newline at end of file

diff --git a/mkdll.sh b/mkdll.sh
index e1e6d988188ff2dcaeb5d76690dcf1962140c16d..d41d0fcd6cf98614bdd6483a7f294a54d8f70b3b 100644 (file)
--- a/mkdll.sh
+++ b/mkdll.sh
@@ -7,11 +7,14 @@
 # library that is loaded into TCL in order to run SQLite.
 #
 make sqlite3.c
+make fts3amal.c
+cat fts3amal.c >>sqlite3.c
 PATH=$PATH:/opt/mingw/bin
 TCLDIR=/home/drh/tcltk/846/win/846win
 TCLSTUBLIB=$TCLDIR/libtcl84stub.a
-OPTS='-DUSE_TCL_STUBS=1 -DTHREADSAFE=1 -DBUILD_sqlite=1 -DOS_WIN=1'
-CC="i386-mingw32msvc-gcc -O2 $OPTS -Itsrc -I$TCLDIR"
+OPTS='-DUSE_TCL_STUBS=1 -DSQLITE_THREADSAFE=1 -DBUILD_sqlite=1 -DOS_WIN=1'
+OPTS="$OPTS -DSQLITE_ENABLE_FTS3=1"
+CC="i386-mingw32msvc-gcc -Os $OPTS -Itsrc -I$TCLDIR"
 NM="i386-mingw32msvc-nm"
 CMD="$CC -c sqlite3.c"
 echo $CMD

diff --git a/publish.sh b/publish.sh
index 5ce647f2bcc2de4af70d32595f5e4863f87fcd4b..21f29797993e0169680d74224303e0d3e54dfa75 100644 (file)
--- a/publish.sh
+++ b/publish.sh
@@ -24,7 +24,11 @@ echo "VERSIONS: $VERS $VERSW"
 #
 make clean
 make sqlite3.c
-gcc -Os -Itsrc sqlite3.c tsrc/shell.c -o sqlite3 -ldl -lpthread
+make fts3amal.c
+cat fts3amal.c >>sqlite3.c
+CFLAGS="-Os -DSQLITE_ENABLE_FTS3=1 -DSQLITE_THREADSAFE=0"
+echo '***** '"COMPILING sqlite3-$VERS.bin..."
+gcc $CFLAGS -Itsrc sqlite3.c tsrc/shell.c -o sqlite3 -ldl -lpthread
 strip sqlite3
 mv sqlite3 sqlite3-$VERS.bin
 gzip sqlite3-$VERS.bin
@@ -35,11 +39,11 @@ mv sqlite3-$VERS.bin.gz doc
 #
 make target_source
 cd tsrc
-rm fts*
+echo '***** BUILDING preprocessed source archives'
+rm fts* icu*
 rm -f ../doc/sqlite-source-$VERSW.zip
 zip ../doc/sqlite-source-$VERSW.zip *
 cd ..
-make sqlite3.c
 cp tsrc/sqlite3.h tsrc/sqlite3ext.h .
 pwd
 zip doc/sqlite-amalgamation-$VERSW.zip sqlite3.c sqlite3.h sqlite3ext.h
@@ -47,16 +51,18 @@ zip doc/sqlite-amalgamation-$VERSW.zip sqlite3.c sqlite3.h sqlite3ext.h
 # Build the sqlite.so and tclsqlite.so shared libraries
 # under Linux
 #
-make sqlite3.c
 TCLDIR=/home/drh/tcltk/846/linux/846linux
 TCLSTUBLIB=$TCLDIR/libtclstub8.4g.a
-gcc -Os -shared -Itsrc sqlite3.c tsrc/tclsqlite.c $TCLSTUBLIB -o tclsqlite3.so
+CFLAGS="-Os -DSQLITE_ENABLE_FTS3=1"
+echo '***** BUILDING shared libraries for linux'
+gcc $CFLAGS -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
-gcc -Os -shared -Itsrc sqlite3.c -o sqlite3.so
+gcc $CFLAGS -shared -Itsrc sqlite3.c -o sqlite3.so
 strip sqlite3.so
 chmod 644 sqlite3.so
 mv sqlite3.so sqlite-$VERS.so
@@ -67,6 +73,7 @@ mv sqlite-$VERS.so.gz doc
 # Build the tclsqlite3.dll and sqlite3.dll shared libraries.
 #
 . $srcdir/mkdll.sh
+echo '***** PACKAGING shared libraries for windows'
 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
@@ -74,19 +81,20 @@ zip doc/sqlitedll-$VERSW.zip sqlite3.dll sqlite3.def
 
 # Build the sqlite.exe executable for windows.
 #
-make target_source
-OPTS='-DSTATIC_BUILD=1 -DNDEBUG=1'
+OPTS='-DSTATIC_BUILD=1 -DNDEBUG=1 -DSQLITE_THREADSAFE=0'
+OPTS="$OPTS -DSQLITE_ENABLE_FTS3=1"
 i386-mingw32msvc-gcc -Os $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
 #
+echo '***** BUILDING source archive'
 ORIGIN=`pwd`
 cd $srcdir
 cd ..
 mv sqlite sqlite-$VERS
-EXCLUDE=`find sqlite-$VERS -print | grep CVS | sed 's,^, --exclude ,'`
+EXCLUDE=`find sqlite-$VERS -print | egrep (CVS|www/|art/|doc/|contrib/) | sed 's,^, --exclude ,'`
 tar czf $ORIGIN/doc/sqlite-$VERS.tar.gz $EXCLUDE sqlite-$VERS
 mv sqlite-$VERS sqlite
 cd $ORIGIN