From df1ef13c269fc387117283c25c35eac4bdcab158 Mon Sep 17 00:00:00 2001 From: Fred Drake Date: Tue, 30 Sep 2003 20:21:03 +0000 Subject: Revert the last change to this script on the 2.3.x maint branch; the rest of the patches needed for that to work are giong to be saved for post-2.3.2 to avoid introducing new risks in the documentation build process. --- Doc/tools/push-docs.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Doc/tools/push-docs.sh b/Doc/tools/push-docs.sh index 5896ad9..89f1870 100755 --- a/Doc/tools/push-docs.sh +++ b/Doc/tools/push-docs.sh @@ -10,12 +10,9 @@ TARGET="$TARGETHOST:$TARGETDIR" ADDRESSES='python-dev@python.org doc-sig@python.org python-list@python.org' -TOOLDIR="`dirname $0`" -VERSION=`$TOOLDIR/getversioninfo` - -# Set $EXTRA to something non-empty if this is a non-trunk version: +VERSION=`echo '$Revision$' | sed 's/[$]Revision: \(.*\) [$]/\1/'` EXTRA=`echo "$VERSION" | sed 's/^[0-9][0-9]*\.[0-9][0-9]*//'` -if echo "$EXTRA" | grep -q '[.]' ; then +if [ "$EXTRA" ] ; then DOCLABEL="maintenance" DOCTYPE="maint" else @@ -76,7 +73,8 @@ cd .. # now in .../Doc/ make --no-print-directory bziphtml || exit $? -PACKAGE="html-$VERSION.tar.bz2" +RELEASE=`grep '^RELEASE=' Makefile | sed 's|RELEASE=||'` +PACKAGE="html-$RELEASE.tar.bz2" scp "$PACKAGE" tools/update-docs.sh $TARGET/ || exit $? ssh "$TARGETHOST" tmp/update-docs.sh $DOCTYPE $PACKAGE '&&' rm tmp/update-docs.sh || exit $? -- cgit v0.12