PATCH: maintainer-scripts/gcc_release and related changes

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

This is the patch that allowed me to generated today's mainline snapshot
without any form of manual intervention (just about four further tweaks
to the script).

Committed and applied to the gccadmin account on gcc.gnu.org.

Gerald

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

	* gcc_release (announce_snapshot): Add substitution of @BRANCH
	for README and index.html.  Remove substitution of @LONG_DATE.
	Put index.html into the respective snapshot directory.
	Adjust subject of the notification mail to the new naming scheme
	for CVS tags.
	Adjust name of the LATEST-IS-... files to the new naming scheme
	for snapshot directories.
	(FTP_PATH): Ditto.
	(LAST_DIR): Ditto.
	(LAST_LONG_DATE): Remove.

	* snapshot-README: Adjust to the new naming schemes for directories
	and snapshots per se.
	Dynamically fill in the respective branch instead of hardcoding it.

	* snapshot-index.html: Replace individual links to diffs with a
	general link to the diff/ subdirectory.
	Mention the concrete snapshot in <title> and <h1>.
	Adjust links to the new location of index.html.

Index: gcc_release
===================================================================
RCS file: /cvs/gcc/gcc/maintainer-scripts/gcc_release,v
retrieving revision 1.35
diff -u -3 -p -r1.35 gcc_release
--- gcc_release	8 Jul 2003 09:54:24 -0000	1.35
+++ gcc_release	9 Jul 2003 12:49:16 -0000
@@ -378,21 +378,21 @@ announce_snapshot() {
   TEXT_DATE=`date --date=$DATE +%B\ %d,\ %Y`
   cd ~ftp/pub/gcc/snapshots
   sed -e "s%@DATE@%$DATE%g" -e "s%@LAST_DATE@%$LAST_DATE%g" \
-    -e "s%@LONG_DATE@%$LONG_DATE%g" \
+    -e "s%@BRANCH@%${BRANCH}%g" \
     -e "s%@TEXT_DATE@%$TEXT_DATE%g" < ~/scripts/snapshot-README > $$
   mv $$ README
   sed -e "s%@DATE@%$DATE%g" -e "s%@LAST_DATE@%$LAST_DATE%g" \
-    -e "s%@LONG_DATE@%$LONG_DATE%g" \
+    -e "s%@BRANCH@%${BRANCH}%g" \
     -e "s%@TEXT_DATE@%$TEXT_DATE%g" < ~/scripts/snapshot-index.html > $$
-  mv $$ index.html
+  mv $$ ${BRANCH}-${DATE}/index.html

-  touch LATEST-IS-$LONG_DATE
-  rm -f LATEST-IS-$LAST_LONG_DATE
+  touch LATEST-IS-${BRANCH}-${DATE}
+  rm -f LATEST-IS-${BRANCH}-${LAST_DATE}

   inform "Sending mail"

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

 ########################################################################
@@ -585,15 +585,14 @@ else
   # For now snapshots come from the 3.3 branch.
   BRANCH="3.3"
   CVSBRANCH=gcc-3_3-branch
-  FTP_PATH="${FTP_PATH}/snapshots/${BRANCH}-${LONG_DATE}"
+  FTP_PATH="${FTP_PATH}/snapshots/${BRANCH}-${DATE}"
   TAG=gcc-ss-`echo ${BRANCH} | tr '.' '_'`-${DATE}

   # 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_LONG_DATE=`date --date=$LAST_DATE +%Y-%m-%d`
-    LAST_DIR=~ftp/pub/gcc/snapshots/${LAST_LONG_DATE}
+    LAST_DIR=~ftp/pub/gcc/snapshots/${BRANCH}-${LAST_DATE}
     OLD_TARS=${LAST_DIR}/gcc-${LAST_DATE}.tar.bz2
   fi
 fi
Index: snapshot-README
===================================================================
RCS file: /cvs/gcc/gcc/maintainer-scripts/snapshot-README,v
retrieving revision 1.10
diff -u -3 -p -r1.10 snapshot-README
--- snapshot-README	18 Jun 2003 12:57:14 -0000	1.10
+++ snapshot-README	9 Jul 2003 12:49:16 -0000
@@ -1,8 +1,8 @@
-gcc-ss-@DATE@ is now available on
-  ftp://gcc.gnu.org/pub/gcc/snapshots/@LONG_DATE@
+gcc-ss-@BRANCH@-@DATE@ is now available on
+  ftp://gcc.gnu.org/pub/gcc/snapshots/@BRANCH@-@DATE@
 and on various mirrors, see http://gcc.gnu.org/mirrors.html for details.

-This snapshot has been generated from the GCC CVS 3.3 branch.
+This snapshot has been generated from the GCC CVS @BRANCH@ branch.

 You'll find:

@@ -23,7 +23,7 @@ You'll find:

   gcc-java-@DATE@.tar.bz2            The Java front end and runtime.

-Diffs from @LAST_DATE@ are available in the diffs/ subdirectory.
+Diffs from @BRANCH@-@LAST_DATE@ are available in the diffs/ subdirectory.


 When a particular snapshot is ready for public consumption the LATEST-IS-
Index: snapshot-index.html
===================================================================
RCS file: /cvs/gcc/gcc/maintainer-scripts/snapshot-index.html,v
retrieving revision 1.7
diff -u -3 -p -r1.7 snapshot-index.html
--- snapshot-index.html	18 Jun 2003 12:57:14 -0000	1.7
+++ snapshot-index.html	9 Jul 2003 12:49:16 -0000
@@ -1,13 +1,11 @@
 <html>

 <head>
-<title>GCC Snapshots</title>
+<title>GCC @BRANCH@-@DATE@ Snapshot</title>
 </head>

 <body>
-<h1>GCC Snapshots</h1>
-
-<hr />
+<h1>GCC @BRANCH@-@DATE@ Snapshot</h1>

 <p>The <a href ="http://gcc.gnu.org/";>GCC Project</a> makes
 periodic snapshots of the GCC source tree available to the public
@@ -19,62 +17,37 @@ how to sign up can be found on the GCC p


 <blockquote>
-    <p> <a href="@LONG_DATE@/gcc-@DATE@.tar.bz2">
+    <p> <a href="gcc-@DATE@.tar.bz2">
 	 gcc</a> @TEXT_DATE@ snapshot, includes all languages.

-    <p> <a href="@LONG_DATE@/diffs/gcc-@LAST_DATE@-@DATE@.diff.bz2">
-	gcc-@LAST_DATE@-@DATE@</a> patch file to bring gcc-@LAST_DATE@ up to
-	gcc-@DATE@.
-
-    <p> <a href="@LONG_DATE@/gcc-core-@DATE@.tar.bz2">
+    <p> <a href="gcc-core-@DATE@.tar.bz2">
 	 gcc-core</a> @TEXT_DATE@ snapshot, includes just the C front
 	 end and core compiler.

-    <p> <a href="@LONG_DATE@/diffs/gcc-core-@LAST_DATE@-@DATE@.diff.bz2">
-	gcc-core-@LAST_DATE@-@DATE@</a> patch file to bring gcc-core-@LAST_DATE@
-	up to gcc-core-@DATE@.
-
-    <p> <a href="@LONG_DATE@/gcc-g++-@DATE@.tar.bz2">
+    <p> <a href="gcc-g++-@DATE@.tar.bz2">
 	 gcc-g++</a> @TEXT_DATE@ snapshot, includes just the C++ front
 	 end and runtime.

-    <p> <a href="@LONG_DATE@/diffs/gcc-g++-@LAST_DATE@-@DATE@.diff.bz2">
-	gcc-g++-@LAST_DATE@-@DATE@</a> patch file to bring gcc-g++-@LAST_DATE@
-	up to gcc-g++-@DATE@.
-
-    <p> <a href="@LONG_DATE@/gcc-g77-@DATE@.tar.bz2">
+    <p> <a href="gcc-g77-@DATE@.tar.bz2">
 	 gcc-g77</a> @TEXT_DATE@ snapshot, includes just the F77 front
 	 end and runtime.

-    <p> <a href="@LONG_DATE@/diffs/gcc-g77-@LAST_DATE@-@DATE@.diff.bz2">
-	gcc-g77-@LAST_DATE@-@DATE@</a> patch file to bring gcc-g77-@LAST_DATE@
-	up to gcc-g77-@DATE@.
-
-    <p> <a href="@LONG_DATE@/gcc-java-@DATE@.tar.bz2">
+    <p> <a href="gcc-java-@DATE@.tar.bz2">
 	 gcc-java</a> @TEXT_DATE@ snapshot, includes just the Java
 	 front end and runtime.

-    <p> <a href="@LONG_DATE@/diffs/gcc-java-@LAST_DATE@-@DATE@.diff.bz2">
-	gcc-java-@LAST_DATE@-@DATE@</a> patch file to bring gcc-java-@LAST_DATE@
-	up to gcc-java-@DATE@.
-
-    <p> <a href="@LONG_DATE@/gcc-objc-@DATE@.tar.bz2">
+    <p> <a href="gcc-objc-@DATE@.tar.bz2">
 	 gcc-objc</a> @TEXT_DATE@ snapshot, includes just the Objective-C
 	 front end and runtime.

-    <p> <a href="@LONG_DATE@/diffs/gcc-objc-@LAST_DATE@-@DATE@.diff.bz2">
-	gcc-objc-@LAST_DATE@-@DATE@</a> patch file to bring gcc-objc-@LAST_DATE@
-	up to gcc-objc-@DATE@.
-
-    <p> <a href="@LONG_DATE@/gcc-ada-@DATE@.tar.bz2">
+    <p> <a href="gcc-ada-@DATE@.tar.bz2">
 	 gcc-ada</a> @TEXT_DATE@ snapshot, includes just the Ada
 	 front end and runtime.

-    <p> <a href="@LONG_DATE@/diffs/gcc-ada-@LAST_DATE@-@DATE@.diff.bz2">
-	gcc-ada-@LAST_DATE@-@DATE@</a> patch file to bring gcc-ada-@LAST_DATE@
-	up to gcc-ada-@DATE@.
-
 </blockquote>
+
+<p>Diffs from @BRANCH@-@LAST_DATE@ are available in the
+<a href="diffs/">diffs/ subdirectory</a>.</p>

 </p>When a particular snapshot is ready for public consumption the LATEST-IS-
 file is updated and a message is sent to the gcc list.  Please do not use