Mainline merge as of 2003-07-22.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/tree-ssa-20020619-branch@69712 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 109 insertions, 86 deletions

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 79c0170cea1..66c53a20af2 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,49 @@
+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.
+
+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@.
+	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.
+	
+2003-07-08  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
+
+	* gcc_release: Move handling of complex modes directly after
+	switch handling.
+	(TAG): Include the branch name as part of snapshot CVS tags.
+
 2003-07-04  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
 
 	* gcc_release: Execute gcc.gnu.org-only operations which are
diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index 558cd796225..3417abb0872 100755
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -377,22 +377,26 @@ 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" \
+  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" \
-    -e "s%@LONG_DATE@%$LONG_DATE%g" \
+  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 $$ index.html
+  mv $$ ${RELEASE}/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-${RELEASE} is now available" gcc@gcc.gnu.org < ~ftp/pub/gcc/snapshots/${RELEASE}/README
 }
 
 ########################################################################
@@ -520,6 +524,25 @@ while getopts "d:fr:u:t:p:sl" ARG; do
 done
 shift `expr ${OPTIND} - 1`
 
+# Handle the major modes.
+while [ $# -ne 0 ]; do
+    case $1 in
+    diffs)    MODE_DIFFS=1;;
+    gzip)     MODE_GZIP=1;;
+    sources)  MODE_SOURCES=1;;
+    tarfiles) MODE_TARFILES=1;;
+    upload)   MODE_UPLOAD=1;;
+    all)      MODE_SOURCES=1; MODE_TARFILES=1; MODE_DIFFS=1; MODE_UPLOAD=1;
+              if [ $SNAPSHOT -ne 1 ]; then
+                # Only for releases and pre-releases.
+                MODE_GZIP=1;
+              fi
+              ;;
+    *)        error "Unknown mode $1";;
+    esac
+    shift
+done
+
 # Perform consistency checking.
 if [ ${LOCAL} -eq 0 ] && [ -z ${CVS_USERNAME} ]; then
   error "No username specified"
@@ -562,20 +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}-${LONG_DATE}"
-  TAG=gcc_ss_${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_LONG_DATE=`date --date=$LAST_DATE +%Y-%m-%d`
-    LAST_DIR=~ftp/pub/gcc/snapshots/${LAST_LONG_DATE}
-    OLD_TARS=${LAST_DIR}/gcc-${LAST_DATE}.tar.bz2
+    LAST_DIR=~ftp/pub/gcc/snapshots/${BRANCH}-${LAST_DATE}
+    OLD_TARS=${LAST_DIR}/gcc-${BRANCH}-${LAST_DATE}.tar.bz2
   fi
 fi
 
@@ -609,25 +632,6 @@ export CVSROOT
 TZ="UTC0"
 export TZ
 
-# Handle the major modes.
-while [ $# -ne 0 ]; do
-    case $1 in
-    diffs)    MODE_DIFFS=1;;
-    gzip)     MODE_GZIP=1;;
-    sources)  MODE_SOURCES=1;;
-    tarfiles) MODE_TARFILES=1;;
-    upload)   MODE_UPLOAD=1;;
-    all)      MODE_SOURCES=1; MODE_TARFILES=1; MODE_DIFFS=1; MODE_UPLOAD=1;
-              if [ $SNAPSHOT -ne 1 ]; then
-                # Only for releases and pre-releases.
-                MODE_GZIP=1;
-              fi
-              ;;
-    *)        error "Unknown mode $1";;
-    esac
-    shift
-done
-
 # Build the source directory.
 
 if [ $MODE_SOURCES -ne 0 ]; then
diff --git a/maintainer-scripts/snapshot-README b/maintainer-scripts/snapshot-README
index 0f4f89458dc..66359e5e3d9 100644
--- a/maintainer-scripts/snapshot-README
+++ b/maintainer-scripts/snapshot-README
@@ -1,29 +1,29 @@
-gcc-ss-@DATE@ is now available on 
-  ftp://gcc.gnu.org/pub/gcc/snapshots/@LONG_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 3.3 branch.
+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 @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-
diff --git a/maintainer-scripts/snapshot-index.html b/maintainer-scripts/snapshot-index.html
index 15e204152e7..3155872480f 100644
--- a/maintainer-scripts/snapshot-index.html
+++ b/maintainer-scripts/snapshot-index.html
@@ -1,13 +1,11 @@
 <html>
 
 <head>
-<title>GCC Snapshots</title>
+<title>GCC @RELEASE@ Snapshot</title>
 </head>
 
 <body>
-<h1>GCC Snapshots</h1>
-
-<hr />
+<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
@@ -19,63 +17,38 @@ how to sign up can be found on the GCC project home page.</p>
 
 
 <blockquote>
-    <p> <a href="@LONG_DATE@/gcc-@DATE@.tar.bz2">
+    <p> <a href="gcc-@RELEASE@.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-@RELEASE@.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++-@RELEASE@.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-@RELEASE@.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-@RELEASE@.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-@RELEASE@.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-@RELEASE@.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
 a snapshot before it has been announced that way.</p>