From: hno <>
Date: Fri, 18 May 2007 07:26:43 +0000 (+0000)
Subject: Add cfgman to Squid-3 snapshot generation
X-Git-Tag: SQUID_3_0_PRE7~265
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b8da3ec119f9a8d5f91421704534cf6acbad82f3;p=thirdparty%2Fsquid.git

Add cfgman to Squid-3 snapshot generation
---

diff --git a/mksnapshot.sh b/mksnapshot.sh
index 9fb1dd4b23..c6dfdf9b61 100755
--- a/mksnapshot.sh
+++ b/mksnapshot.sh
@@ -47,6 +47,10 @@ if (echo $VERSION | grep PRE) || (echo $VERSION | grep STABLE); then
 	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
@@ -70,3 +74,14 @@ 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 -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 -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