PATCH: maintainers-scripts/gcc_release and snapshot-*

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

This is a first step to fix a long-standing deficiency of gcc_release
wrt. snapshots, where we did not properly use ${RELEASE} (instead of
${DATE} or ${BRANCH}-${DATE}).

With this and a few related changes I will contribute after Monday's
snapshot successfully ran, snapshots of the 3.3-branch continue to
operate fully automatic and filenames etc. now properly contain the
name of the branch as well.

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

Gerald

2003-07-13  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.

Index: gcc_release
===================================================================
RCS file: /cvs/gcc/gcc/maintainer-scripts/gcc_release,v
retrieving revision 1.36
diff -u -3 -p -r1.36 gcc_release
--- gcc_release	9 Jul 2003 13:24:07 -0000	1.36
+++ gcc_release	13 Jul 2003 22:02:03 -0000
@@ -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

Index: snapshot-README
===================================================================
RCS file: /cvs/gcc/gcc/maintainer-scripts/snapshot-README,v
retrieving revision 1.11
diff -u -3 -p -r1.11 snapshot-README
--- snapshot-README	9 Jul 2003 13:24:07 -0000	1.11
+++ snapshot-README	13 Jul 2003 22:02:03 -0000
@@ -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.

Index: snapshot-index.html
===================================================================
RCS file: /cvs/gcc/gcc/maintainer-scripts/snapshot-index.html,v
retrieving revision 1.8
diff -u -3 -p -r1.8 snapshot-index.html
--- snapshot-index.html	9 Jul 2003 13:24:07 -0000	1.8
+++ snapshot-index.html	13 Jul 2003 22:02:03 -0000
@@ -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 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.