Bootstrapped

diff --git a/mkrelease.sh b/mkrelease.sh
index 1884bf7fe6b7994ef97637cb6a61efe397a87204..42cd33dae4b3d71571f95c93afd0178d51a735db 100755 (executable)
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -3,8 +3,12 @@ if [ $# -ne 1 -a $# -ne 2 ]; then
        echo "Usage: $0 revision [destination]"
        exit 1
 fi
-package=squid
+# VCS details
 module=squid3
+BZRROOT=${BZRROOT:-/bzr}
+
+# infer tags from command line details
+package=squid
 rev=`echo $1 | sed -e "s/^${package}-//"`
 name=${package}-${rev}
 tag=`echo ${name} | tr a-z.- A-Z__`
@@ -24,32 +28,29 @@ fi
 
 tmpdir=${TMPDIR:-${PWD}}/${name}-mkrelease
 
-CVSROOT=${CVSROOT:-/server/cvs-server/squid}
-export CVSROOT
-
 rm -rf $name.tar.gz $tmpdir
 trap "rm -rf $tmpdir" 0
 
-cvs -Q export -d $tmpdir -r $tag $module
+bzr export $tmpdir $BZRROOT/$module/tags/$tag || exit 1
 if [ ! -f $tmpdir/configure ]; then
        echo "ERROR! Tag $tag not found in $module"
 fi
 
 cd $tmpdir
-eval `grep "^ *VERSION=" configure | sed -e 's/-CVS//'`
+eval `grep "^ *VERSION=" configure | sed -e 's/-BZR//'`
 eval `grep "^ *PACKAGE=" configure`
 if [ ${name} != ${PACKAGE}-${VERSION} ]; then
-       echo "ERROR! The version numbers does not match!"
+       echo "ERROR! The tag and configure version numbers do not match!"
        echo "${name} != ${PACKAGE}-${VERSION}"
        exit 1
 fi
 RELEASE=`echo $VERSION | cut -d. -f1,2 | cut -d- -f1`
 ed -s configure.in <<EOS
-g/${VERSION}-CVS/ s//${VERSION}/
+g/${VERSION}-BZR/ s//${VERSION}/
 w
 EOS
 ed -s configure <<EOS
-g/${VERSION}-CVS/ s//${VERSION}/
+g/${VERSION}-BZR/ s//${VERSION}/
 w
 EOS
 ed -s include/version.h <<EOS

diff --git a/mksnapshot-cron.sh b/mksnapshot-cron.sh
deleted file mode 100755 (executable)
index 50d9e17..0000000
--- a/mksnapshot-cron.sh
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/sh -e
-# Nightly cron job to generate snapshot releases
-top=$PWD
-versions=/server/httpd/htdocs/squid-cache.org/Versions/
-TMPDIR=/tmp/hno.cron
-export TMPDIR
-if [ -d $TMPDIR ]; then
-       chmod -R +w $TMPDIR
-       rm -rf $TMPDIR
-fi
-mkdir -p $TMPDIR
-trap "cd /; chmod -R +w $TMPDIR; rm -rf $TMPDIR" 0
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin
-export PATH
-
-# Be nice to our friends. This is a batch job
-renice 10 $$ >/dev/null
-
-make_snapshot()
-{ {
-  set -e
-  cd ../release
-  mksnap=$1
-  tag=$2
-  dir=$3
-  ver=$4
-  save=${5:-3}
-  dst=$versions/$dir/$ver
-  $mksnap $tag 2>&1 | grep -v "set owner/group"
-  for file in `cat $tag.out` ; do
-    case $file in
-    *-cfgman.tar.gz)
-       type=-cfgman.tar.gz
-       ;;
-    *)
-       type=`echo $file | sed -e 's/.*\.tar\.gz/.tar.gz/' -e 's/.*\.tar\.bz2/.tar.bz2/' -e 's/.*\.patch/.patch/' -e 's/.*\.diff/.diff/' -e 's/.*-RELEASENOTES.html/-RELEASENOTES.html/' -e 's/^.*ChangeLog.txt$/-ChangeLog.txt/' -e 's/.*-cfgman/-cfgman/'`
-    esac
-
-    # move tarball
-    rm -f $dst/$file.md5
-    rm -f $dst/$file
-    md5 $file >$dst/$file.md5
-    cp -p $file $dst/$file
-    rm -f $file
-
-    # update snapshot symlink
-    rm -f $dst/squid-$ver.snapshot$type
-    ln -s $file $dst/squid-$ver.snapshot$type
-    rm -f $dst/squid-$ver.snapshot$type.md5
-    ln -s $file $dst/squid-$ver.snapshot$type.md5
-
-    # cleanup old snapshots
-    ls $dst/*-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$type | sed -e 's/.*-\([0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]'$type'\)/\1/' | sort -r | tail +$save | while read f; do
-       rm -f $dst/*-$f $dst/*-$f.md5
-    done
-
-    # Special cases
-    case $file in
-    *-cfgman.tar.gz)
-       mkdir -p $dst/cfgman
-       tar -C $dst/cfgman -zxf $dst/$file
-       ;;
-    *-cfgman.html)
-       rm -f $dst/cfgman.html
-       ln -s $dst/$file $dst/cfgman.html
-       ;;
-    *-cfgman.html.gz)
-       rm -f $dst/cfgman.html.gz
-       ln -s $dst/$file $dst/cfgman.html.gz
-       ;;
-    esac
-  done
-
-  # update web page
-  if [ -x $dst/make.sh ]; then
-      $dst/make.sh
-  fi
-
-} }
-
-set +e
-
-../commit/bootstrap squid
-#make_snapshot ../commit/squid/mksnapshot.sh HEAD v3 HEAD 6
-
-rm -f /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new
-cp ../commit/squid/CONTRIBUTORS /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new
-chmod 444 /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new
-mv -f /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.txt
-
-rm -f /server/httpd/htdocs/squid-cache.org/SPONSORS.new
-cp ../commit/squid/SPONSORS /server/httpd/htdocs/squid-cache.org/SPONSORS.new
-chmod 444 /server/httpd/htdocs/squid-cache.org/SPONSORS.new
-mv -f /server/httpd/htdocs/squid-cache.org/SPONSORS.new /server/httpd/htdocs/squid-cache.org/SPONSORS.txt
-
-#../commit/bootstrap squid-3.0
-#make_snapshot ../commit/squid/mksnapshot.sh SQUID_3_0 v3 3.0 3
-make_snapshot ../commit/squid/mksnapshot.sh HEAD v3 3.0 3
-
-../commit/bootstrap squid-2
-make_snapshot ../commit/squid-2/mksnapshot.sh HEAD v2 HEAD 3
-
-../commit/bootstrap squid-2.6
-make_snapshot ../commit/squid-2.6/mksnapshot.sh SQUID_2_6 v2 2.6 3
-
-#../commit/bootstrap squid-2.5
-#make_snapshot ../commit/squid-2.5/mksnapshot.sh SQUID_2_5 v2 2.5 3
-
-#../commit/squid3-SQUID2.sync

diff --git a/mksnapshot.sh b/mksnapshot.sh
deleted file mode 100755 (executable)
index 29844ae..0000000
--- a/mksnapshot.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh -e
-if [ $# -gt 1 ]; then
-       echo "Usage: $0 [branch]"
-       exit 1
-fi
-module=squid3
-tag=${1:-HEAD}
-startdir=$PWD
-date=`env TZ=GMT date +%Y%m%d`
-
-tmpdir=${TMPDIR:-${PWD}}/${module}-${tag}-mksnapshot
-
-CVSROOT=${CVSROOT:-/server/cvs-server/squid}
-export CVSROOT
-
-rm -rf $tmpdir
-trap "rm -rf $tmpdir" 0
-
-rm -f ${tag}.out
-cvs -Q export -d $tmpdir -r $tag $module
-if [ ! -f $tmpdir/configure ]; then
-       echo "ERROR! Tag $tag not found in $module"
-fi
-
-cd $tmpdir
-eval `grep "^ *VERSION=" configure | sed -e 's/-CVS//'`
-eval `grep "^ *PACKAGE=" configure`
-ed -s configure.in <<EOS
-g/${VERSION}-CVS/ s//${VERSION}-${date}/
-w
-EOS
-ed -s configure <<EOS
-g/${VERSION}-CVS/ s//${VERSION}-${date}/
-w
-EOS
-
-./configure --silent
-make -s dist-all
-
-basetarball=/server/httpd/htdocs/squid-cache.org/Versions/v`echo $VERSION | cut -d. -f1`/`echo $VERSION | cut -d. -f-2|cut -d- -f1`/${PACKAGE}-${VERSION}.tar.bz2
-if (echo $VERSION | grep PRE) || (echo $VERSION | grep STABLE); then
-       echo "Differences from ${PACKAGE}-${VERSION} to ${PACKAGE}-${VERSION}-${date}" >${PACKAGE}-${VERSION}-${date}.diff
-       if [ -f $basetarball ]; then
-               tar jxf ${PACKAGE}-${VERSION}-${date}.tar.bz2
-               tar jxf $basetarball
-               diff -ruN ${PACKAGE}-${VERSION} ${PACKAGE}-${VERSION}-${date} >>${PACKAGE}-${VERSION}-${date}.diff || true
-       else
-               cvs -q rdiff -u -r SQUID_`echo $VERSION | tr .- __` -r $tag $module >>${PACKAGE}-${VERSION}-${date}.diff || true
-       fi
-elif [ -f STABLE_BRANCH ]; then
-       stable=`cat STABLE_BRANCH`
-       echo "Differences from ${stable} to ${PACKAGE}-${VERSION}-${date}" >${PACKAGE}-${VERSION}-${date}.diff
-       cvs -q rdiff -u -r $stable -r $tag $module >>${PACKAGE}-${VERSION}-${date}.diff
-fi
-
-cd $startdir
-cp -p $tmpdir/${PACKAGE}-${VERSION}-${date}.tar.gz .
-echo ${PACKAGE}-${VERSION}-${date}.tar.gz >>${tag}.out
-cp -p $tmpdir/${PACKAGE}-${VERSION}-${date}.tar.bz2 .
-echo ${PACKAGE}-${VERSION}-${date}.tar.bz2 >>${tag}.out
-if [ -f $tmpdir/${PACKAGE}-${VERSION}-${date}.diff ]; then
-    cp -p $tmpdir/${PACKAGE}-${VERSION}-${date}.diff .
-    echo ${PACKAGE}-${VERSION}-${date}.diff >>${tag}.out
-fi
-
-relnotes=$tmpdir/doc/release-notes/release-`echo $VERSION | cut -d. -f1,2 | cut -d- -f1`.html
-if [ -f $relnotes ]; then
-       cp -p $relnotes ${PACKAGE}-${VERSION}-${date}-RELEASENOTES.html
-       echo ${PACKAGE}-${VERSION}-${date}-RELEASENOTES.html >>${tag}.out
-       ed -s ${PACKAGE}-${VERSION}-${date}-RELEASENOTES.html <<EOF
-g/"ChangeLog"/ s//"${PACKAGE}-${VERSION}-${date}-ChangeLog.txt"/g
-w
-EOF
-fi
-cp -p $tmpdir/ChangeLog ${PACKAGE}-${VERSION}-${date}-ChangeLog.txt
-echo ${PACKAGE}-${VERSION}-${date}-ChangeLog.txt >>${tag}.out
-
-if [ -x $tmpdir/scripts/www/build-cfg-help.pl ]; then
-       make -C $tmpdir/src cf.data
-       mkdir -p $tmpdir/doc/cfgman
-       $tmpdir/scripts/www/build-cfg-help.pl --version ${VERSION} -o $tmpdir/doc/cfgman $tmpdir/src/cf.data
-       sh -c "cd $tmpdir/doc/cfgman && tar -zcf $PWD/${PACKAGE}-${VERSION}-${date}-cfgman.tar.gz *"
-       echo ${PACKAGE}-${VERSION}-${date}-cfgman.tar.gz >>${tag}.out
-       $tmpdir/scripts/www/build-cfg-help.pl --version ${VERSION} -o ${PACKAGE}-${VERSION}-${date}-cfgman.html -f singlehtml $tmpdir/src/cf.data
-       gzip -f -9 ${PACKAGE}-${VERSION}-${date}-cfgman.html
-       echo ${PACKAGE}-${VERSION}-${date}-cfgman.html.gz >>${tag}.out
-fi