Update the publish.sh script so that it no longer generates documentation

pages (that is handled by the version 3.0.0 publish.sh).  Also insert
version numbers in the filenames of all build products. (CVS 1601)

FossilOrigin-Name: f2b8d35825a2137e83419e9aebc9619a9db2ada8

diff --git a/manifest b/manifest
index 8b2f11e1b84a88c381ee7e7acf39904fe08c6a27..8e9840825ba680841f04c226a78e2ab17fb9a408 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sauthenticate\sstatements\swhen\sreading\sthe\sschema.\s\sBackport\sof\sbug\nfix\sin\s(1588)\sto\sversion\s2.\s(CVS\s1591)
-D 2004-06-14T11:58:37
+C Update\sthe\spublish.sh\sscript\sso\sthat\sit\sno\slonger\sgenerates\sdocumentation\npages\s(that\sis\shandled\sby\sthe\sversion\s3.0.0\spublish.sh).\s\sAlso\sinsert\nversion\snumbers\sin\sthe\sfilenames\sof\sall\sbuild\sproducts.\s(CVS\s1601)
+D 2004-06-16T01:21:01
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -16,7 +16,7 @@ F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh f6b283068efa69f06eb8aa1fe4bddfdbdeb35826
 F main.mk 1b27efb94be53a96c4333584a00a59fcc87ddc37
-F publish.sh 1cd5c982388560fa91eedf6a338e210f713b35c8
+F publish.sh fdad85589c24373715253c88643898255c8aaccd
 F spec.template a38492f1c1dd349fc24cb0565e08afc53045304b
 F sqlite.1 83f4a9d37bdf2b7ef079a82d54eaf2e3509ee6ea
 F sqlite.def fc4f5734786fe4743cfe2aa98eb2da4b089edb5f
@@ -188,7 +188,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 7d3937743f88acad8859fbbbb1c03271a939bc0b
-R 18025706e1348c88f79d57e0222aa7e4
+P 24adf9ed5988d6e110a750f75b767fad163689c6
+R bad18b9b4e0f573517fda2790c833ba9
 U drh
-Z 1300c540e4cc9cf82e1d8566d79bb8e0
+Z 8af7b97de359371eafa7d3ea06076f21

diff --git a/manifest.uuid b/manifest.uuid
index 3ecfb76539008746c2fc8a59075e21ba29ecf47c..b6be415622829a08377bcd2ab4fe7c84bc21b508 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-24adf9ed5988d6e110a750f75b767fad163689c6
\ No newline at end of file
+f2b8d35825a2137e83419e9aebc9619a9db2ada8
\ No newline at end of file

diff --git a/publish.sh b/publish.sh
index d15e9bf7034ffbb5ea5ff546b3e56e2ee3eb65c1..544ffd33f4a9977b57e9b272a1204698ac352307 100644 (file)
--- a/publish.sh
+++ b/publish.sh
@@ -16,37 +16,49 @@ srcdir=`echo "$0" | sed 's%\(^.*\)/[^/][^/]*$%\1%'`
 cp $srcdir/Makefile.linux-gcc ./Makefile
 chmod +x $srcdir/install-sh
 
+# Clear out the build directory "doc"
+#
+#rm -rf doc
+#make doc
+
+# Get the current version number - needed to help build filenames
+#
+VERS=`cat $srcdir/VERSION`
+VERSW=`sed 's/\./_/g' $srcdir/VERSION`
+
 # Start building stuff.
 #
 make clean
 make sqlite
 strip sqlite
-mv sqlite sqlite.bin
+mv sqlite sqlite-$VERS.bin
 rm -f sqlite.bin.gz
-gzip sqlite.bin
+gzip sqlite-$VERS.bin
+mv sqlite-$VERS.bin.gz doc
 
 # Build the tclsqlite.so shared library for import into tclsh or wish
 # under Linux
 #
 make target_source
-rm sqlite_source.zip
+rm -f doc/sqlite-source-$VERSW.zip
 cd tsrc
-zip ../sqlite_source.zip *
+zip ../doc/sqlite-source-$VERSW.zip *
 rm shell.c
 TCLDIR=/home/drh/tcltk/8.2linux
 TCLSTUBLIB=$TCLDIR/libtclstub8.2g.a
 OPTS='-DUSE_TCL_STUBS=1 -DNDEBUG=1'
 gcc -fPIC $OPTS -O2 -I. -I$TCLDIR -shared *.c $TCLSTUBLIB -o tclsqlite.so
 strip tclsqlite.so
-mv tclsqlite.so ..
+mv tclsqlite.so tclsqlite-$VERS.so
+gzip tclsqlite-$VERS.so
+mv tclsqlite-$VERS.so.gz ../doc
 rm tclsqlite.c
 gcc -fPIC -DNDEBUG=1 -O2 -I. -shared *.c -o sqlite.so
 strip sqlite.so
-mv sqlite.so ..
+mv sqlite.so sqlite-$VERS.so
+gzip sqlite-$VERS.so
+mv sqlite-$VERS.so.gz ../doc
 cd ..
-rm -f tclsqlite.so.gz sqlite.so.gz
-gzip tclsqlite.so
-gzip sqlite.so
 
 # Build the tclsqlite.dll shared library that can be imported into tclsh
 # or wish on windows.
@@ -76,7 +88,7 @@ i386-mingw32msvc-dllwrap \
      --target i386-mingw32 \
      -dllname tclsqlite.dll -lmsvcrt *.o $TCLSTUBLIB
 i386-mingw32msvc-strip tclsqlite.dll
-mv tclsqlite.dll ..
+mv tclsqlite.dll ../tclsqlite-$VERSW.dll
 rm tclsqlite.o
 cat >sqlite.def <<\END_OF_FILE
 EXPORTS
@@ -133,11 +145,9 @@ i386-mingw32msvc-dllwrap \
      --target i386-mingw32 \
      -dllname sqlite.dll -lmsvcrt *.o
 i386-mingw32msvc-strip sqlite.dll
-mv sqlite.dll sqlite.def ..
+zip ../doc/tclsqlite-$VERSW.zip tclsqlite.dll
+zip ../doc/tclsqlite-$VERSW.zip sqlite.dll sqlite.def
 cd ..
-rm -f tclsqlite.zip sqlitedll.zip
-zip tclsqlite.zip tclsqlite.dll
-zip sqlitedll.zip sqlite.dll sqlite.def
 
 # Build the sqlite.exe executable for windows.
 #
@@ -146,10 +156,8 @@ cd tsrc
 rm tclsqlite.c
 OPTS='-DSTATIC_BUILD=1 -DNDEBUG=1'
 i386-mingw32msvc-gcc -O2 $OPTS -I. -I$TCLDIR *.c -o sqlite.exe
-mv sqlite.exe ..
+zip ../doc/sqlite-$VERSW.zip sqlite.exe
 cd ..
-rm -f sqlite.zip
-zip sqlite.zip sqlite.exe
 
 # Construct a tarball of the source tree
 #
@@ -157,11 +165,8 @@ ORIGIN=`pwd`
 cd $srcdir
 cd ..
 EXCLUDE=`find sqlite -print | grep CVS | sed 's,sqlite/, --exclude sqlite/,'`
-tar czf $ORIGIN/sqlite.tar.gz $EXCLUDE sqlite
+tar czf $ORIGIN/doc/sqlite-$VERS.tar.gz $EXCLUDE sqlite
 cd $ORIGIN
-vers=`cat $srcdir/VERSION`
-rm -f sqlite-$vers.tar.gz
-ln sqlite.tar.gz sqlite-$vers.tar.gz
 
 #
 # Build RPMS (binary) and Source RPM
@@ -182,21 +187,11 @@ mkdir $HOME/rpm/SPECS
 sed s/SQLITE_VERSION/$vers/g $srcdir/spec.template > $HOME/rpm/SPECS/sqlite.spec
 
 # copy the source tarball to the rpm directory
-cp sqlite-$vers.tar.gz $HOME/rpm/SOURCES/.
+cp doc/sqlite-$VERS.tar.gz $HOME/rpm/SOURCES/.
 
 # build all the rpms
 rpm -ba $HOME/rpm/SPECS/sqlite.spec >& rpm-$vers.log
 
 # copy the RPMs into the build directory.
-ln $HOME/rpm/RPMS/i386/sqlite*-$vers*.rpm .
-ln $HOME/rpm/SRPMS/sqlite-$vers*.rpm .
-
-
-# Build the website
-#
-cp $srcdir/../historical/* .
-rm -rf doc
-make doc
-ln sqlite.bin.gz sqlite.zip sqlite*.tar.gz tclsqlite.so.gz tclsqlite.zip doc
-ln sqlitedll.zip sqlite.so.gz sqlite_source.zip doc
-ln *.rpm doc
+mv $HOME/rpm/RPMS/i386/sqlite*-$VERS*.rpm doc
+mv $HOME/rpm/SRPMS/sqlite-$VERS*.rpm doc