Remove snapshot scripts from 3.2 branch

diff --git a/configure.in b/configure.in
index dc65b49b3a0234a0ebca6243b51a515c7d47f5ad..5ac2127c868b042e1b798dc867d0aa30ca21a6c1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl  $Id$
 dnl
 dnl
 dnl
-AC_INIT([Squid Web Proxy],[3.HEAD-BZR],[http://www.squid-cache.org/bugs/],[squid])
+AC_INIT([Squid Web Proxy],[3.2.0.0-BZR],[http://www.squid-cache.org/bugs/],[squid])
 AC_PREREQ(2.61)
 AC_CONFIG_HEADERS([include/autoconf.h])
 AC_CONFIG_AUX_DIR(cfgaux)

diff --git a/mksnapshot-cron.sh b/mksnapshot-cron.sh
deleted file mode 100755 (executable)
index 8b7100c..0000000
--- a/mksnapshot-cron.sh
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/sh -ex
-echo "RUN: $0"
-# Nightly cron job to generate snapshot releases
-top=${PWD}
-versions=/server/httpd/htdocs/squid-cache.org/content/Versions/
-TMPDIR=/home/squidadm/${LOGNAME}.cron
-export TMPDIR
-if [ -d ${TMPDIR} ]; then
-       chmod -R +w ${TMPDIR}
-       rm -rf ${TMPDIR}
-fi
-mkdir -p ${TMPDIR}
-trap "echo FAIL-BUILD_snapshot-cron; 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}
-  branch=${2}
-  dir=${3}
-  ver=${4}
-  save=${5:-3}
-  dst=${versions}/${dir}/${ver}
-  out=${6:-`basename $branch`}
-  $mksnap ${branch} ${6} 2>&1 | grep -v "set owner/group"
-  for file in `cat ${out}.out` ; do
-    case ${file} in
-    *-cfgman.tar.gz)
-       type=-cfgman.tar.gz
-       ;;
-    *-langpack.tar.gz)
-       type=-langpack.tar.gz
-       ;;
-    *-manuals.tar.gz)
-       type=-manuals.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}.md5 ${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
-       ;;
-    *-manuals.tar.gz)
-       mkdir -p ${dst}/manuals
-       tar -C ${dst}/manuals -zxf ${dst}/${file}
-       ;;
-    esac
-  done
-
-  # update web page
-  if [ -x ${dst}/make.sh ]; then
-    cd ${dst}
-    ./make.sh
-    cd ${top}/../release
-  fi
-
-} }
-
-set +e
-
-# autotool derived files not kept in trunk, but still need to bootstrap for make dist
-../commit/bootstrap squid-3
-make_snapshot ../commit/squid-3/mksnapshot.sh trunk v3 3.HEAD 6
-
-rm -f /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new
-cp ../commit/squid-3/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/content/CONTRIBUTORS.txt
-
-rm -f /server/httpd/htdocs/squid-cache.org/SPONSORS.new
-cp ../commit/squid-3/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/content/SPONSORS.txt
-
-../commit/bootstrap squid-3.1
-make_snapshot ../commit/squid-3/mksnapshot.sh branches/SQUID_3_1 v3 3.1 3
-
-#../commit/bootstrap squid-3.0
-#make_snapshot ../commit/squid-3/mksnapshot.sh branches/SQUID_3_0 v3 3.0 3
-
-../commit/bootstrap squid-2
-make_snapshot ../commit/squid-2/mksnapshot.sh HEAD v2 HEAD 3
-
-../commit/bootstrap squid-2.7
-make_snapshot ../commit/squid-2.7/mksnapshot.sh SQUID_2_7 v2 2.7 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 89b38d8..0000000
--- a/mksnapshot.sh
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/sh -ex
-
-if [ $# -lt 1 ]; then
-       echo "Usage: $0 [branch]"
-       echo "Where [branch] is the path under /bzr/ to the branch to snapshot."
-       exit 1
-fi
-# VCS details
-module=squid3
-BZRROOT=${BZRROOT:-/bzr}
-
-# generate a tarball name from the branch ($1) note that trunk is at
-# /bzr/trunk, but we call it 3.HEAD for consistency with CVS (squid 2.x), and
-# branches are in /bzr/branches/ but we don't want 'branches/' in the tarball
-# name so we strip that.
-branchpath=${1:-trunk}
-tag=${2:-`basename $branchpath`}
-startdir=${PWD}
-date=`env TZ=GMT date +%Y%m%d`
-
-tmpdir=${TMPDIR:-${PWD}}/${module}-${tag}-mksnapshot
-
-rm -rf ${tmpdir}
-trap "echo FAIL-BUILD_${VERSION} ; rm -rf ${tmpdir}" 0
-
-rm -f ${tag}.out
-bzr export ${tmpdir} ${BZRROOT}/${module}/${branchpath} || exit 1
-if [ ! -f ${tmpdir}/configure ] && [ -f ${tmpdir}/configure.in ]; then
-       sh -c "cd ${tmpdir} && ./bootstrap.sh"
-fi
-if [ ! -f ${tmpdir}/configure ]; then
-       echo "ERROR! Tag ${tag} not found in ${module}"
-fi
-
-cd ${tmpdir}
-eval `grep "^ *PACKAGE_VERSION=" configure | sed -e 's/-BZR//' | sed -e 's/PACKAGE_//'`
-eval `grep "^ *PACKAGE_TARNAME=" configure | sed -e 's/_TARNAME//'`
-ed -s configure.in <<EOS
-g/${VERSION}-[A-Z]*/ s//${VERSION}-${date}/
-w
-EOS
-ed -s configure <<EOS
-g/${VERSION}-[A-Z]*/ s//${VERSION}-${date}/
-w
-EOS
-
-echo "STATE..."
-echo "PACKAGE: ${PACKAGE}"
-echo "VERSION: ${VERSION}"
-echo "TAG: ${tag}"
-echo "STARTDIR: ${startdir}"
-echo "TMPDIR: ${tmpdir}"
-
-./test-builds.sh --cleanup || exit 1
-./configure --silent
-make -s dist-all
-
-webbase=/server/httpd/htdocs/squid-cache.org/content/
-basetarball=${webbase}/Versions/v`echo ${VERSION} | cut -d. -f1`/`echo ${VERSION} | cut -d. -f-2|cut -d- -f1`/${PACKAGE}-${VERSION}.tar.bz2
-
-echo "Building Tarball diff (${basetarball}) ..."
-if [ -f ${basetarball} ]; then
-       tar jxf ${PACKAGE}-${VERSION}-${date}.tar.bz2
-       tar jxf ${basetarball}
-       echo "Differences from ${PACKAGE}-${VERSION} to ${PACKAGE}-${VERSION}-${date}" >${PACKAGE}-${VERSION}-${date}.diff
-       diff -ruN ${PACKAGE}-${VERSION} ${PACKAGE}-${VERSION}-${date} >>${PACKAGE}-${VERSION}-${date}.diff || true
-else
-       echo "Building Tarball diff ... skipped (no tarball exists)."
-fi
-
-cd ${startdir}
-echo "Preparing to publish: ${tmpdir}/${PACKAGE}-${VERSION}-${date}.tar.* ..."
-#echo "LOCAL: " ; pwd
-#echo "BUILT TARS: " ; ls -1 ${tmpdir}/*.tar.* || true
-
-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
-
-# Generate Configuration Manual HTML
-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
-
-# Collate Manual Pages and generate HTML versions
-if (groff --help >/dev/null); then
-       make -C ${tmpdir}/src squid.8
-       if [ ! -d ${tmpdir}/doc/manuals ] ; then
-               mkdir -p ${tmpdir}/doc/manuals
-       fi
-       for f in `ls -1 ${tmpdir}/helpers/*/*/*.8 ${tmpdir}/src/*.8 ${tmpdir}/tools/*.1 ${tmpdir}/tools/*.8 ./helpers/*/*/*.8 2>/dev/null` ; do
-               cp $f ${tmpdir}/doc/manuals/
-       done
-       for f in `ls -1 ${tmpdir}/doc/manuals/*.1  ${tmpdir}/doc/manuals/*.8 2>/dev/null` ; do
-               cat ${f} | groff -E -Thtml -mandoc >${f}.html
-       done
-       sh -c "cd ${tmpdir}/doc/manuals && tar -zcf ${PWD}/${PACKAGE}-${VERSION}-${date}-manuals.tar.gz *.html *.1 *.8"
-       echo ${PACKAGE}-${VERSION}-${date}-manuals.tar.gz >>${tag}.out
-fi
-
-# Generate language-pack tarballs
-# NP: Only to be done on trunk.
-if test "${tag}" = "trunk" ; then
-       sh -c "cd ${tmpdir}/errors && tar -zcf ${PWD}/${PACKAGE}-${VERSION}-${date}-langpack.tar.gz ./*/* ./alias* ./TRANSLATORS ./COPYRIGHT "
-       echo ${PACKAGE}-${VERSION}-${date}-langpack.tar.gz >>${tag}.out
-fi