[Python-checkins] CVS: python/dist/src/Doc/tools push-docs.sh,1.6.2.3,1.6.2.4 update-docs.sh,1.6.2.2,1.6.2.3

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Doc/tools
In directory usw-pr-cvs1:/tmp/cvs-serv22681

Modified Files:
      Tag: release21-maint
	push-docs.sh update-docs.sh 
Log Message:
Update to push the docs to python.org instead of python.sf.net.

Index: push-docs.sh
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/push-docs.sh,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -C2 -d -r1.6.2.3 -r1.6.2.4
*** push-docs.sh	10 Jan 2002 23:10:20 -0000	1.6.2.3
--- push-docs.sh	1 Apr 2002 20:13:08 -0000	1.6.2.4
***************
*** 4,8 ****
  #  update-docs.sh script unpacks them into their final destination.
  
! TARGET=python.sourceforge.net:/home/users/f/fd/fdrake/tmp
  
  ADDRESSES='python-dev@python.org doc-sig@python.org python-list@python.org'
--- 4,11 ----
  #  update-docs.sh script unpacks them into their final destination.
  
! TARGETHOST=www.python.org
! TARGETDIR=/usr/home/fdrake/tmp
! 
! TARGET="$TARGETHOST:$TARGETDIR"
  
  ADDRESSES='python-dev@python.org doc-sig@python.org python-list@python.org'
***************
*** 69,73 ****
  PACKAGE="html-$RELEASE.tar.bz2"
  scp "$PACKAGE" tools/update-docs.sh $TARGET/ || exit $?
! ssh python.sourceforge.net tmp/update-docs.sh $DOCTYPE $PACKAGE '&&' rm tmp/update-docs.sh || exit $?
  
  if $ANNOUNCE ; then
--- 72,76 ----
  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 $?
  
  if $ANNOUNCE ; then
***************
*** 79,83 ****
  The $DOCLABEL version of the documentation has been updated:
  
!     http://python.sourceforge.net/$DOCTYPE-docs/
  
  $EXPLANATION
--- 82,86 ----
  The $DOCLABEL version of the documentation has been updated:
  
!     http://$TARGETHOST/dev/doc/$DOCTYPE/
  
  $EXPLANATION

Index: update-docs.sh
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/update-docs.sh,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -C2 -d -r1.6.2.2 -r1.6.2.3
*** update-docs.sh	9 May 2001 16:26:36 -0000	1.6.2.2
--- update-docs.sh	1 Apr 2002 20:13:08 -0000	1.6.2.3
***************
*** 2,8 ****
  
  # Script which installs a development snapshot of the documentation
! # into the "Python @ SourceForge" website.
  #
! # The push-docs.sh script pushes this to the SourceForge when needed
  # and removes it when done.
  
--- 2,8 ----
  
  # Script which installs a development snapshot of the documentation
! # into the development website.
  #
! # The push-docs.sh script pushes this to the server when needed
  # and removes it when done.
  
***************
*** 17,21 ****
  TMPDIR="$$-docs"
  
! cd /home/groups/p/py/python/htdocs || exit $?
  mkdir $TMPDIR || exit $?
  cd $TMPDIR || exit $?
--- 17,21 ----
  TMPDIR="$$-docs"
  
! cd /ftp/ftp.python.org/pub/www.python.org/dev/doc/ || exit $?
  mkdir $TMPDIR || exit $?
  cd $TMPDIR || exit $?
***************
*** 23,30 ****
  cd .. || exit $?
  
! if [ -d $DOCTYPE-docs ] ; then
!     mv $DOCTYPE-docs $DOCTYPE-temp
  fi
! mv $TMPDIR $DOCTYPE-docs
  rm -rf $DOCTYPE-temp || exit $?
  rm "$UPDATES" || exit $?
--- 23,30 ----
  cd .. || exit $?
  
! if [ -d $DOCTYPE ] ; then
!     mv $DOCTYPE $DOCTYPE-temp
  fi
! mv $TMPDIR $DOCTYPE
  rm -rf $DOCTYPE-temp || exit $?
  rm "$UPDATES" || exit $?