This is most of a changeover of scripts for squid 3 trunk to use bzr; the missing bit appears to need a bzr 1.1 (to do 'rdiff' basically) or thereabouts, I'll look into that in a bit. I'm not sure that the unconverted cvs calls will actually trigger with our current setup or not.
-Rob -- GPG key available at: <http://www.robertcollins.net/keys.txt>.
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [EMAIL PROTECTED] # e5kae9czem63ux4z # target_branch: file:///home/robertc/archives/robertc%40squid-\ # cache.org--squid/squid/3.0/cvsps-HEAD/ # testament_sha1: ccb5a5b25492531abe14f982c2dd791f98b573bf # timestamp: 2007-12-30 11:23:27 +1100 # base_revision_id: cvs-1:hno-20071220081046-d59dmpbuvvyioekf # # Begin patch === modified file 'configure.in' --- configure.in 2007-12-19 09:36:26 +0000 +++ configure.in 2007-12-30 00:22:22 +0000 @@ -5,7 +5,7 @@ dnl dnl dnl -AC_INIT(Squid Web Proxy, 3.HEAD-CVS, http://www.squid-cache.org/bugs/, squid) +AC_INIT(Squid Web Proxy, 3.HEAD-BZR, http://www.squid-cache.org/bugs/, squid) AC_PREREQ(2.52) AM_CONFIG_HEADER(include/autoconf.h) AC_CONFIG_AUX_DIR(cfgaux) === modified file 'mkrelease.sh' --- mkrelease.sh 2007-08-31 02:31:41 +0000 +++ mkrelease.sh 2007-12-30 00:22:22 +0000 @@ -3,8 +3,12 @@ echo "Usage: $0 revision [destination]" exit 1 fi +# VCS details +module=squid3 +BZRROOT=${BZRROOT:-/bzr} + +# infer tags from command line details package=squid -module=squid3 rev=`echo $1 | sed -e "s/^${package}-//"` name=${package}-${rev} tag=`echo ${name} | tr a-z.- A-Z__` @@ -24,32 +28,29 @@ 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 === modified file 'mksnapshot.sh' --- mksnapshot.sh 2007-09-20 03:29:13 +0000 +++ mksnapshot.sh 2007-12-30 00:22:22 +0000 @@ -1,36 +1,46 @@ #!/bin/sh -e + if [ $# -gt 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 -tag=${1:-HEAD} +BZRROOT=${BZRROOT:-/bzr} + +# generate a tarball name from the branch ($1) note that trunk is at +# /bzr/trunk, but we call it 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. +tag="HEAD" +branchpath=${1:-trunk} +if [ "trunk" != "$branchpath" ]; then + tag=`echo $branchpath | sed -e "s/^branches\///"` +fi 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 +bzr export $tmpdir $BZRROOT/$branchpath || 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` ed -s configure.in <<EOS -g/${VERSION}-CVS/ s//${VERSION}-${date}/ +g/${VERSION}-BZR/ s//${VERSION}-${date}/ w EOS ed -s configure <<EOS -g/${VERSION}-CVS/ s//${VERSION}-${date}/ +g/${VERSION}-BZR/ s//${VERSION}-${date}/ w EOS # Begin bundle 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
signature.asc
Description: This is a digitally signed message part
