From 203c211064752f2062f30594d9ec45732546ce7d Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 29 Mar 2002 18:16:04 +0000 Subject: [PATCH] Combine the homerpm.sh file in with publish.sh. Update the website files to refer to the new RPMs that are now being built. Fix a small problem with the spec file. (CVS 505) FossilOrigin-Name: 57d4c7704794d0a28cbf67be3f90dbf81bf3b05d --- homerpm.sh | 11 ----------- manifest | 23 +++++++++++------------ manifest.uuid | 2 +- publish.sh | 20 ++++++++++++++------ spec.template | 1 - www/changes.tcl | 21 ++++++++++----------- www/download.tcl | 14 +++++++++++--- www/index.tcl | 15 +++++++++------ 8 files changed, 56 insertions(+), 51 deletions(-) delete mode 100755 homerpm.sh diff --git a/homerpm.sh b/homerpm.sh deleted file mode 100755 index 0812da6baf..0000000000 --- a/homerpm.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -echo "%HOME %{expand:%%(cd; pwd)}" > $HOME/.rpmmacros -echo "%_topdir %{HOME}/rpm" >> $HOME/.rpmmacros - -mkdir $HOME/rpm -mkdir $HOME/rpm/BUILD -mkdir $HOME/rpm/SOURCES -mkdir $HOME/rpm/RPMS -mkdir $HOME/rpm/SRPMS -mkdir $HOME/rpm/SPECS diff --git a/manifest b/manifest index 0160bd2c13..35a3aa88bd 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C added\sa\ssection\sto\screate\sa\sspec\sfile\sand\sbuild\sthe\srpm\sfiles\s(CVS\s504) -D 2002-03-29T01:29:54 +C Combine\sthe\shomerpm.sh\sfile\sin\swith\spublish.sh.\s\sUpdate\sthe\swebsite\sfiles\sto\nrefer\sto\sthe\snew\sRPMs\sthat\sare\snow\sbeing\sbuilt.\s\sFix\sa\ssmall\sproblem\swith\nthe\sspec\sfile.\s(CVS\s505) +D 2002-03-29T18:16:04 F Makefile.in 50f1b3351df109b5774771350d8c1b8d3640130d F Makefile.template 89e373b2dad0321df00400fa968dc14b61a03296 F README a4c0ba11354ef6ba0776b400d057c59da47a4cc0 @@ -13,12 +13,11 @@ F configure 9303d975dbd577fbe61e615045ddc02015b59fb5 x F configure.ac 38e2e5594cab99eb3a753b0614fcc36f4ddbbb48 F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac -F homerpm.sh d1adb74efdd1c0b04d5c521935c14616dff433f1 x F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 F libtool c56e618713c9510a103bda6b95f3ea3900dcacd6 F ltmain.sh e9ed72eb1d690f447c13945eaf69e28af531eda1 -F publish.sh 5c0d940c8aac42be8911d4161826794560603fce -F spec.template 80255831b0c3c16c1cc2bb08dd15cb8800a04a64 +F publish.sh 0b9da5898bf5997f30d6f80de4880072db7e5718 +F spec.template 238f7db425a78dc1bb7682e56e3834c7270a3f5e F sqlite.1 2e2bb0529ef468ade9e4322bd609d0695fb9ded9 F src/TODO af7f3cab0228e34149cf98e073aa83d45878e7e6 F src/btree.c 7dd7ddc66459982dd0cb9800958c1f8d65a32d9f @@ -117,14 +116,14 @@ F www/arch.fig d5f9752a4dbf242e9cfffffd3f5762b6c63b3bcf F www/arch.png 82ef36db1143828a7abc88b1e308a5f55d4336f4 F www/arch.tcl 72a0c80e9054cc7025a50928d28d9c75c02c2b8b F www/c_interface.tcl 567cda531aac9d68a61ef02e26c6b202bd856db2 -F www/changes.tcl 96b42ab657fcdd9cc1dbf3c5e935917c96e71d0a +F www/changes.tcl 255d65014ca4b67f1d6d7b8151324e4249bf7ca5 F www/conflict.tcl 81dd21f9a679e60aae049e9dd8ab53d59570cda2 F www/crosscompile.tcl 3622ebbe518927a3854a12de51344673eb2dd060 -F www/download.tcl a6d75b8b117cd33dcb090bef7e80d7556d28ebe0 +F www/download.tcl 870e87c458d58e0867463e06ea66eec343332d3f F www/dynload.tcl 02eb8273aa78cfa9070dd4501dca937fb22b466c F www/faq.tcl fb1e92e2f604546694f83a36d969492f52fb685d F www/formatchng.tcl 2ce21ff30663fad6618198fe747ce675df577590 -F www/index.tcl 64d32b1952138a007c1db5753c5b046d4b83dda1 +F www/index.tcl 7d2952a4738a6b913724ab7d02ae73b7085a4860 F www/lang.tcl e6c277480c4e31877c08509af7a16f6c69bb1046 F www/mingw.tcl f1c7c0a7f53387dd9bb4f8c7e8571b7561510ebc F www/opcode.tcl bdec8ef9f100dbd87bbef8976c54b88e43fd8ccc @@ -132,7 +131,7 @@ F www/speed.tcl da8afcc1d3ccc5696cfb388a68982bc3d9f7f00f F www/sqlite.tcl 8b5884354cb615049aed83039f8dfe1552a44279 F www/tclsqlite.tcl 829b393d1ab187fd7a5e978631b3429318885c49 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218 -P 3c25359376814e9c3912246d79528614a3499e5b -R 0b4fa0ab8c0a36dd8fe21df7be719be5 -U doughenry -Z d38052f9eb649f56f5dfcf9ea11c6c7c +P e529143967a6fd4e65dea6a5ff68a7aabc36f787 +R c284576111a1e591595153abeca388b4 +U drh +Z 73362d0343176b7525b4f3bbee07609d diff --git a/manifest.uuid b/manifest.uuid index 9985c57e53..c66797fe06 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e529143967a6fd4e65dea6a5ff68a7aabc36f787 \ No newline at end of file +57d4c7704794d0a28cbf67be3f90dbf81bf3b05d \ No newline at end of file diff --git a/publish.sh b/publish.sh index fcb2b40971..7993e41074 100644 --- a/publish.sh +++ b/publish.sh @@ -145,10 +145,16 @@ ln sqlite.tar.gz sqlite-$vers.tar.gz # Build RPMS (binary) and Source RPM # -# this script sets up the home directory so normal users can build rpms -# by default this would only be allowed by root. This really only needs -# done once, but each time shouldn't hurt anything. -$srcdir/homerpm.sh +# Make sure we are properly setup to build RPMs +# +echo "%HOME %{expand:%%(cd; pwd)}" > $HOME/.rpmmacros +echo "%_topdir %{HOME}/rpm" >> $HOME/.rpmmacros +mkdir $HOME/rpm +mkdir $HOME/rpm/BUILD +mkdir $HOME/rpm/SOURCES +mkdir $HOME/rpm/RPMS +mkdir $HOME/rpm/SRPMS +mkdir $HOME/rpm/SPECS # create the spec file from the template sed s/SQLITE_VERSION/$vers/g $srcdir/spec.template > $HOME/rpm/SPECS/sqlite.spec @@ -159,8 +165,9 @@ cp sqlite-$vers.tar.gz $HOME/rpm/SOURCES/. # build all the rpms rpm -ba $HOME/rpm/SPECS/sqlite.spec >& rpm-$vers.log -# this part I'm not sure about, looks like the rpms may need copied here or -# linked to? +# 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 @@ -170,3 +177,4 @@ 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 diff --git a/spec.template b/spec.template index 776d56f302..2d9c82d06d 100644 --- a/spec.template +++ b/spec.template @@ -35,7 +35,6 @@ to develop programs that use the sqlite database library. %build CFLAGS="%optflags -DNDEBUG=1" CXXFLAGS="%optflags -DNDEBUG=1" ./configure --prefix=%{_prefix} -%make make make doc diff --git a/www/changes.tcl b/www/changes.tcl index 082d983e15..f465c3cd59 100644 --- a/www/changes.tcl +++ b/www/changes.tcl @@ -8,18 +8,13 @@ puts {

Recent Changes To SQLite

-
> -*** This page has is no longer maintained. *** -
-
-The change log is now generated automatically by the CVS server -for SQLite. To see the latest changes, visit: -
+

+This file provides a high-level summary of changes to SQLite. +For more detail, refer the the checkin logs generated by +CVS at -http://cvs.hwaci.com:2080/sqlite/timeline - -

-
+http://cvs.hwaci.com:2080/sqlite/timeline. +

} @@ -32,6 +27,10 @@ proc chng {date desc} { chng {2002 Mar 24 (2.4.4)} {
  • Added support for CASE expressions (patch from Dan Kennedy)
    • +
  • Added RPMS to the delivery (patches from Doug Henry)
    • +
  • Fix typos in the documentation
    • +
  • Cut over configuration management to a new CVS repository with + its own CVSTrac bug tracking system.
    • } chng {2002 Mar 22 (2.4.3)} { diff --git a/www/download.tcl b/www/download.tcl index b8a7fddd69..a8d68b0478 100644 --- a/www/download.tcl +++ b/www/download.tcl @@ -1,7 +1,7 @@ # # Run this TCL script to generate HTML for the download.html file. # -set rcsid {$Id: download.tcl,v 1.3 2002/01/31 15:54:23 drh Exp $} +set rcsid {$Id: download.tcl,v 1.4 2002/03/29 18:16:04 drh Exp $} puts { SQLite Download Page @@ -20,9 +20,9 @@ proc Product {file desc} { if {![file exists $file]} return set size [file size $file] puts [subst { - +
    - @@ -46,6 +46,10 @@ Product sqlite.so.gz { tclsqlite.so.gz but without the TCL bindings. } +foreach name [lsort -dict [glob -nocomplain sqlite-*.i386.rpm]] { + Product $name "An RPM for Linux" +} + puts {

    Precompiled Binaries For Windows

    } Product sqlite.zip { @@ -72,6 +76,10 @@ Product {sqlite_source.zip} { MS-Windows users who lack the build support infrastructure of Unix. } +foreach name [lsort -dict [glob -nocomplain sqlite-*.src.rpm]] { + Product $name "Source RPM" +} + foreach name [lsort -dict -decreasing [glob -nocomplain sqlite-*.tar.gz]] { regexp {sqlite-(.*)\.tar\.gz} $name match vers Product $name " diff --git a/www/index.tcl b/www/index.tcl index 3a9d443969..c742260806 100644 --- a/www/index.tcl +++ b/www/index.tcl @@ -1,7 +1,7 @@ # # Run this TCL script to generate HTML for the index.html file. # -set rcsid {$Id: index.tcl,v 1.55 2002/03/27 12:52:48 drh Exp $} +set rcsid {$Id: index.tcl,v 1.56 2002/03/29 18:16:04 drh Exp $} puts {SQLite: An SQL Database Engine In A C Library @@ -61,12 +61,15 @@ three functions and one opaque structure. puts {

    Current Status

    -

    A change history +

    A Change Summary is available on this +website. You can also access a detailed +change history and a list of -open bugs are -both available from the -CVS server. -Complete source code and precompiled binaries for the latest release are +open bugs +from the +CVS server.

    + +

    Complete source code and precompiled binaries for the latest release are available for download on this site. You can also obtain the latest changes by anonymous CVS access: 

    -- 
2.47.3
    + $file
    ($size bytes)     		[string trim $desc]