diff options
| author | Fred Drake <fdrake@acm.org> | 2003-09-28 22:14:29 (GMT) |
|---|---|---|
| committer | Fred Drake <fdrake@acm.org> | 2003-09-28 22:14:29 (GMT) |
| commit | 69db2b967a3437e557195e8469d2fe57aa937750 (patch) | |
| tree | 6e03d3c3bb985ef26cee6d196e2ac5288ab6a2ab /Doc/tools | |
| parent | 984920bbad4b0909dd060ca40fe0a76f6b4f4116 (diff) | |
| download | cpython-69db2b967a3437e557195e8469d2fe57aa937750.zip cpython-69db2b967a3437e557195e8469d2fe57aa937750.tar.gz cpython-69db2b967a3437e557195e8469d2fe57aa937750.tar.bz2 | |
- change computation of VERSION to use tools/getversioninfo; this is
more reliable than using the $Revision$ expansion
- $RELEASE is no longer needed; we can just use $VERSION now
Diffstat (limited to 'Doc/tools')
| -rwxr-xr-x | Doc/tools/push-docs.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Doc/tools/push-docs.sh b/Doc/tools/push-docs.sh index ab789e6..e361f6f 100755 --- a/Doc/tools/push-docs.sh +++ b/Doc/tools/push-docs.sh @@ -10,9 +10,13 @@ TARGET="$TARGETHOST:$TARGETDIR" ADDRESSES='python-dev@python.org doc-sig@python.org python-list@python.org' -VERSION=`echo '$Revision$' | sed 's/[$]Revision: \(.*\) [$]/\1/'` +TOOLDIR="`dirname $0`" +VERSION=`$TOOLDIR/getversioninfo` + +# Set $EXTRA to something non-empty if this is a non-trunk version: EXTRA=`echo "$VERSION" | sed 's/^[0-9][0-9]*\.[0-9][0-9]*//'` -if [ "$EXTRA" ] ; then + +if echo "$EXTRA" | grep -q '[.]' ; then DOCLABEL="maintenance" DOCTYPE="maint" else @@ -68,8 +72,7 @@ cd .. # now in .../Doc/ make --no-print-directory bziphtml || exit $? -RELEASE=`grep '^RELEASE=' Makefile | sed 's|RELEASE=||'` -PACKAGE="html-$RELEASE.tar.bz2" +PACKAGE="html-$VERSION.tar.bz2" scp "$PACKAGE" tools/update-docs.sh $TARGET/ || exit $? ssh "$TARGETHOST" tmp/update-docs.sh $DOCTYPE $PACKAGE '&&' rm tmp/update-docs.sh || exit $? |