From: Michael Smith Date: Mon, 25 Jun 2007 23:32:15 +0000 (+0000) Subject: Filter out some messages generated during xsl-ns packaging; cut X-Git-Tag: release/1.79.1~6^2~2104 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c60ed92aacc0e3f734cae11c98494746269c0292;p=docbook-dsssl Filter out some messages generated during xsl-ns packaging; cut out PREVIOUS_REVISION stuff. --- diff --git a/releasetools/docbook-build b/releasetools/docbook-build index eb6eb894f..9d223002c 100755 --- a/releasetools/docbook-build +++ b/releasetools/docbook-build @@ -212,8 +212,6 @@ else DIFFVER=`cat $DISTRO/VERSION` fi - PREVIOUS_REVISION=`if [ -f $DISTRO/PreviousRevision ]; then cat $DISTRO/PreviousRevision; fi` - if grep "/dev/null; then cp -p $DISTRO/VERSION $DISTRO/VERSION.tmp sed "s/Version>.\+$RELEASEVERSION\_$REVISION\ $DISTRO/VERSION @@ -259,11 +257,6 @@ These snapshots are intended for testing purposes only and otherwise come with no guarantees. Any of them may in fact be broken at any given time. EOF - if [ -n "$PREVIOUS_REVISION" ]; then - svn cleanup - svn log --verbose -r HEAD:$PREVIOUS_REVISION $DISTRO > $DISTRO/LatestChanges - fi - if [ "$UPLOAD" = "yes" ]; then make $ZIPTARG -C $DISTRO ZIPVER=$RELEASEVERSION TMP=$TMP XSLT="$DOCBOOK_SVN/buildtools/xslt -xsltproc" PDF_MAKER=xep || exit 1 @@ -315,7 +308,7 @@ EOF if [ -f $LOGDIR/docbook-$DISTRO-$RELEASEVERSION.log.tmp ]; then # filter raw log and copy to site cat $LOGDIR/docbook-$DISTRO-$RELEASEVERSION.log.tmp \ - | grep -v '^cvs log: \|cvs update\|^tar: \|^tar \|^ adding: \|^find \|^cd \|rm \|^mkdir \|^touch \|cvs2log\|mergechangelogs' \ + | grep -v '^cvs log: \|cvs update\|^tar: \|^tar \|^ adding: \|^find \|^cd \|rm \|^mkdir \|^touch \|cvs2log\|mergechangelogs\|\s*(\|^ inflating: docbook-\|^ extracting: docbook-\|^docbook-' \ > $LOGDIR/docbook-$DISTRO-$RELEASEVERSION.log scp $LOGDIR/docbook-$DISTRO-$RELEASEVERSION.log $SITEUSER@$SITEHOST:$SITEBASE fi