PATCH: maintainer-scripts/gcc_release

[Gerald Pfeifer <pfeifer at dbai dot tuwien dot ac dot at>]

Most of these are cleanups of problems preceeding my rewrite, the OLD_TARS
change is an adjustment now that all recent snapshots have been generated
using the new scheme, and the move of the README file is required for fully
automated "parallel" snapshots.

Installed on mainline and the gccadmin account on gcc.gnu.org.

Gerald

2003-07-19  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>

	* gcc_release (announce_snapshot): Use ${RELEASE} instead
	of ${BRANCH}-${DATE} to refer to the snapshot directory.
	Put README file into the snapshot directory.

	(RELEASE): Define as ${BRANCH}-${DATE} for snapshots.
	(FTP_PATH): Use ${RELEASE} in case of snapshots.
	(TAG): Ditto.
	(OLD_TARS): Adjust to new directory scheme for snapshots.

Index: gcc_release
===================================================================
RCS file: /cvs/gcc/gcc/maintainer-scripts/gcc_release,v
retrieving revision 1.37
diff -u -3 -p -r1.37 gcc_release
--- gcc_release	13 Jul 2003 22:10:03 -0000	1.37
+++ gcc_release	19 Jul 2003 12:09:39 -0000
@@ -382,13 +382,13 @@ announce_snapshot() {
     -e "s%@BRANCH@%${BRANCH}%g" \
     -e "s%@RELEASE@%${RELEASE}%g" \
     -e "s%@TEXT_DATE@%$TEXT_DATE%g" < ~/scripts/snapshot-README > $$
-  mv $$ README
+  mv $$ ${RELEASE}/README
   sed -e "s%@DATE@%$DATE%g" \
      -e "s%@LAST_DATE@%$LAST_DATE%g" \
     -e "s%@BRANCH@%${BRANCH}%g" \
     -e "s%@RELEASE@%${RELEASE}%g" \
     -e "s%@TEXT_DATE@%$TEXT_DATE%g" < ~/scripts/snapshot-index.html > $$
-  mv $$ ${BRANCH}-${DATE}/index.html
+  mv $$ ${RELEASE}/index.html

   touch LATEST-IS-${BRANCH}-${DATE}
   rm -f LATEST-IS-${BRANCH}-${LAST_DATE}
@@ -396,7 +396,7 @@ announce_snapshot() {
   inform "Sending mail"

   export QMAILHOST=gcc.gnu.org
-  mail -s "gcc-ss-${BRANCH}-${DATE} is now available" gccadmin@gcc.gnu.org < ~ftp/pub/gcc/snapshots/README
+  mail -s "gcc-ss-${RELEASE} is now available" gcc@gcc.gnu.org < ~ftp/pub/gcc/snapshots/${RELEASE}/README
 }

 ########################################################################
@@ -585,19 +585,20 @@ if [ $SNAPSHOT -eq 0 ]; then
     FTP_PATH="${FTP_PATH}/releases/gcc-${RELEASE}/"
   fi
 else
-  RELEASE=$DATE
   # For now snapshots come from the 3.3 branch.
   BRANCH="3.3"
   CVSBRANCH=gcc-3_3-branch
-  FTP_PATH="${FTP_PATH}/snapshots/${BRANCH}-${DATE}"
-  TAG=gcc-ss-`echo ${BRANCH} | tr '.' '_'`-${DATE}
+
+  RELEASE=${BRANCH}-${DATE}
+  FTP_PATH="${FTP_PATH}/snapshots/${RELEASE}"
+  TAG=gcc-ss-`echo ${RELEASE} | tr '.' '_'`

   # Building locally on gcc.gnu.org, we know what the last snapshot date
   # was.
   if [ $MODE_DIFFS -ne 0 ] && [ $LOCAL -ne 0 ]; then
     LAST_DATE=`cat ~/.snapshot_date-${BRANCH}`
     LAST_DIR=~ftp/pub/gcc/snapshots/${BRANCH}-${LAST_DATE}
-    OLD_TARS=${LAST_DIR}/gcc-${LAST_DATE}.tar.bz2
+    OLD_TARS=${LAST_DIR}/gcc-${BRANCH}-${LAST_DATE}.tar.bz2
   fi
 fi