From 1116457a0df4a09fae9daffa1fa143748962f61c Mon Sep 17 00:00:00 2001
From: Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
Date: Mon, 14 Jul 2003 00:10:03 +0200
Subject: [PATCH] gcc_release (announce_snapshot): Add substitution of
 @RELEASE@ for README and index.html.

	* gcc_release (announce_snapshot): Add substitution of @RELEASE@
	for README and index.html.
	* snapshot-README: Use it.
	* snapshot-index.html: Ditto.

From-SVN: r69307
---
 maintainer-scripts/ChangeLog           | 11 +++++++++--
 maintainer-scripts/gcc_release         |  8 ++++++--
 maintainer-scripts/snapshot-README     | 22 +++++++++++-----------
 maintainer-scripts/snapshot-index.html | 18 +++++++++---------
 4 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 5546f66cdb2..a46a26b1cfb 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,7 +1,14 @@
+2003-07-14  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
+
+	* gcc_release (announce_snapshot): Add substitution of @RELEASE@
+	for README and index.html.
+	* snapshot-README: Use it.
+	* snapshot-index.html: Ditto.
+
 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.
+	* 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.
diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index e9d3437ea40..479a19f8a9a 100755
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -377,12 +377,16 @@ 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" \
+  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-README > $$
   mv $$ README
-  sed -e "s%@DATE@%$DATE%g" -e "s%@LAST_DATE@%$LAST_DATE%g" \
+  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
 
diff --git a/maintainer-scripts/snapshot-README b/maintainer-scripts/snapshot-README
index 7fd96efc2b2..66359e5e3d9 100644
--- a/maintainer-scripts/snapshot-README
+++ b/maintainer-scripts/snapshot-README
@@ -1,27 +1,27 @@
-gcc-ss-@BRANCH@-@DATE@ is now available on 
-  ftp://gcc.gnu.org/pub/gcc/snapshots/@BRANCH@-@DATE@
+gcc-ss-@RELEASE@ is now available on 
+  ftp://gcc.gnu.org/pub/gcc/snapshots/@RELEASE@/
 and on various mirrors, see http://gcc.gnu.org/mirrors.html for details.
 
 This snapshot has been generated from the GCC CVS @BRANCH@ branch.
 
 You'll find:
 
-  gcc-@DATE@.tar.bz2                 The full GCC snapshot, including all
-                                       languages and runtime libraries.
+  gcc-@RELEASE@.tar.bz2              The full GCC snapshot, including all
+                                        languages and runtime libraries.
 
-  gcc-core-@DATE@.tar.bz2            Just the C front end and core compiler.
+  gcc-core-@RELEASE@.tar.bz2         Just the C front end and core compiler.
 
-  gcc-testsuite-@DATE@.tar.bz2       The GCC testsuite.
+  gcc-testsuite-@RELEASE@.tar.bz2    The GCC testsuite.
 
-  gcc-ada-@DATE@.tar.bz2             The Ada language and runtime.
+  gcc-ada-@RELEASE@.tar.bz2          The Ada language and runtime.
 
-  gcc-g++-@DATE@.tar.bz2             The C++ front end and runtime.
+  gcc-g++-@RELEASE@.tar.bz2          The C++ front end and runtime.
 
-  gcc-g77-@DATE@.tar.bz2             The F77 front end and runtime.
+  gcc-g77-@RELEASE@.tar.bz2          The F77 front end and runtime.
 
-  gcc-objc-@DATE@.tar.bz2            The Objective-C front end and runtime.
+  gcc-objc-@RELEASE@.tar.bz2         The Objective-C front end and runtime.
 
-  gcc-java-@DATE@.tar.bz2            The Java front end and runtime.
+  gcc-java-@RELEASE@.tar.bz2         The Java front end and runtime.
 
 Diffs from @BRANCH@-@LAST_DATE@ are available in the diffs/ subdirectory. 
 
diff --git a/maintainer-scripts/snapshot-index.html b/maintainer-scripts/snapshot-index.html
index b39072f435b..3155872480f 100644
--- a/maintainer-scripts/snapshot-index.html
+++ b/maintainer-scripts/snapshot-index.html
@@ -1,11 +1,11 @@
 <html>
 
 <head>
-<title>GCC @BRANCH@-@DATE@ Snapshot</title>
+<title>GCC @RELEASE@ Snapshot</title>
 </head>
 
 <body>
-<h1>GCC @BRANCH@-@DATE@ Snapshot</h1>
+<h1>GCC @RELEASE@ 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
@@ -17,30 +17,30 @@ how to sign up can be found on the GCC project home page.</p>
 
 
 <blockquote>
-    <p> <a href="gcc-@DATE@.tar.bz2">
+    <p> <a href="gcc-@RELEASE@.tar.bz2">
 	 gcc</a> @TEXT_DATE@ snapshot, includes all languages.
 
-    <p> <a href="gcc-core-@DATE@.tar.bz2">
+    <p> <a href="gcc-core-@RELEASE@.tar.bz2">
 	 gcc-core</a> @TEXT_DATE@ snapshot, includes just the C front
 	 end and core compiler.
 
-    <p> <a href="gcc-g++-@DATE@.tar.bz2">
+    <p> <a href="gcc-g++-@RELEASE@.tar.bz2">
 	 gcc-g++</a> @TEXT_DATE@ snapshot, includes just the C++ front
 	 end and runtime.
 
-    <p> <a href="gcc-g77-@DATE@.tar.bz2">
+    <p> <a href="gcc-g77-@RELEASE@.tar.bz2">
 	 gcc-g77</a> @TEXT_DATE@ snapshot, includes just the F77 front
 	 end and runtime.
 
-    <p> <a href="gcc-java-@DATE@.tar.bz2">
+    <p> <a href="gcc-java-@RELEASE@.tar.bz2">
 	 gcc-java</a> @TEXT_DATE@ snapshot, includes just the Java
 	 front end and runtime.
 
-    <p> <a href="gcc-objc-@DATE@.tar.bz2">
+    <p> <a href="gcc-objc-@RELEASE@.tar.bz2">
 	 gcc-objc</a> @TEXT_DATE@ snapshot, includes just the Objective-C
 	 front end and runtime.
 
-    <p> <a href="gcc-ada-@DATE@.tar.bz2">
+    <p> <a href="gcc-ada-@RELEASE@.tar.bz2">
 	 gcc-ada</a> @TEXT_DATE@ snapshot, includes just the Ada
 	 front end and runtime.