2004-08-03 Kelley Cook <kcook@gcc.gnu.org>

* maintainer-scripts (snapshot_print): New function. (announce_snapshot): Generate announcment on the fly. Use a directory link for LATEST. * snapshot-README: Delete. * snapshot-index.html: Delete. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@85508 138bc75d-0d04-0410-961f-82ee72b054a4
author: Kelley Cook <kcook@gcc.gnu.org> 2004-08-03 21:42:18 +0000
committer: Kelley Cook <kcook@gcc.gnu.org> 2004-08-03 21:42:18 +0000
commit: d4de8ff9018f98cc80fdc8e6fb896ac76eac530e (patch)
tree: 480a24f193aeb977cf9e8f9c262a0c5923a5a77f /maintainer-scripts
parent: 726eeafeb488f31d059248af4ce888c1a3940e9f (diff)
4 files changed, 102 insertions, 125 deletions
diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 8c444e2412b..9902f1b06db 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,11 @@
+2004-08-03 Kelley Cook  <kcook@gcc.gnu.org>
+
+	* maintainer-scripts (snapshot_print): New function.
+	(announce_snapshot): Generate announcment on the fly.
+	Use a directory link for LATEST.
+	* snapshot-README: Delete.
+	* snapshot-index.html: Delete.
+
 2004-06-09  Paolo Bonzini  <bonzini@gnu.org>
 
 	* gcc_release (build_sources): Move the libcpp gmo files
diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index 5a1d5d5ccdf..8d49ce9c967 100755
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -407,36 +407,110 @@ upload_files() {
   done
 }
 
+#Print description if snapshot exists
+snapshot_print() {
+  if [ -e ${RELEASE}/${SNAP_FILE} ]; then
+     printf "%-38s%s\n\n" "${SNAP_FILE}" "${SNAP_DESCRIPTION}" >> ${SNAPSHOT_README}
+     echo -e "  <tr><td><a href=\"${SNAP_FILE}\">${SNAP_FILE}</a></td>\n" \
+             "      <td>${SNAP_DESCRIPTION}</td></tr>" >> ${SNAPSHOT_INDEX}
+  fi
+}
+
 # Announce a snapshot, both on the web and via mail.
 announce_snapshot() {
   inform "Updating links and READMEs on the FTP server"
   
   TEXT_DATE=`date --date=$DATE +%B\ %d,\ %Y`
+  SNAPSHOT_README=${RELEASE}/README
+  SNAPSHOT_INDEX=${RELEASE}/index.html
+
   changedir "${SNAPSHOTS_DIR}"
-  sed -e "s%@DATE@%$DATE%g" \
-    -e "s%@TEXT_DATE@%$TEXT_DATE%g" \
-    -e "s%@LAST_DATE@%$LAST_DATE%g" \
-    -e "s%@BRANCH@%${BRANCH}%g" \
-    -e "s%@RELEASE@%${RELEASE}%g" \
-    -e "s%@EXPORT@%${EXPORTTAG} ${EXPORTDATE}%g" \
-    ~/scripts/snapshot-README > $$
-  mv $$ ${RELEASE}/README
-  sed -e "s%@DATE@%$DATE%g" \
-    -e "s%@TEXT_DATE@%$TEXT_DATE%g" \
-    -e "s%@LAST_DATE@%$LAST_DATE%g" \
-    -e "s%@BRANCH@%${BRANCH}%g" \
-    -e "s%@RELEASE@%${RELEASE}%g" \
-    -e "s%@EXPORT@%${EXPORTTAG} ${EXPORTDATE}%g" \
-    ~/scripts/snapshot-index.html > $$
-  mv $$ ${RELEASE}/index.html
-
-  touch LATEST-IS-${BRANCH}-${DATE}
-  rm -f LATEST-IS-${BRANCH}-${LAST_DATE}
+  echo -e "Snapshot gcc-"${RELEASE}" is now available on" \
+          "\n  ftp://gcc.gnu.org/pub/gcc/snapshots/"${RELEASE}"/" \
+          "\nand on various mirrors, see http://gcc.gnu.org/mirrors.html for details." \
+          "\n\nThis snapshot has been generated from the GCC "${BRANCH}" CVS branch" \
+          "\nwith the following options: "${EXPORTTAG} ${EXPORTDATE} \
+          "\n\nYou'll find:\n" > ${SNAPSHOT_README}
+
+  echo -e "<html>" \
+          "\n\n<head>" \
+          "\n<title>GCC "${RELEASE}" Snapshot</title>" \
+          "\n</head>" \
+          "\n\n<body>" \
+          "\n<h1>GCC "${RELEASE}" Snapshot</h1>" \
+          "\n\n<p>The <a href =\"http://gcc.gnu.org/\">GCC Project</a> makes" \
+          "\nperiodic snapshots of the GCC source tree available to the public" \
+          "\nfor testing purposes.</p>" \
+          "\n\n<p>If you are planning to download and use one of our snapshots, then" \
+          "\nwe highly recommend you join the GCC developers list.  Details for" \
+          "\nhow to sign up can be found on the GCC project home page.</p>" \
+          "\n\n<p>This snapshot has been generated from the GCC "${BRANCH}" CVS branch" \
+          "\nwith the following options: <code>"${EXPORTTAG} ${EXPORTDATE}"</code></p>" \
+          "\n\n<table>" > ${SNAPSHOT_INDEX}
+       
+  SNAP_FILE=gcc-${RELEASE}.tar.bz2
+  SNAP_DESCRIPTION="Complete GCC (includes all of below)"
+  snapshot_print
+
+  SNAP_FILE=gcc-core-${RELEASE}.tar.bz2
+  SNAP_DESCRIPTION="C front end and core compiler"
+  snapshot_print
+
+  SNAP_FILE=gcc-ada-${RELEASE}.tar.bz2
+  SNAP_DESCRIPTION="Ada front end and runtime"
+  snapshot_print
+
+  SNAP_FILE=gcc-fortran-${RELEASE}.tar.bz2
+  SNAP_DESCRIPTION="Fortran front end and runtime"
+  snapshot_print
+
+  SNAP_FILE=gcc-g++-${RELEASE}.tar.bz2
+  SNAP_DESCRIPTION="C++ front end and runtime"
+  snapshot_print
+
+  SNAP_FILE=gcc-g77-${RELEASE}.tar.bz2
+  SNAP_DESCRIPTION="Fortran 77 front end and runtime"
+  snapshot_print
+
+  SNAP_FILE=gcc-java-${RELEASE}.tar.bz2
+  SNAP_DESCRIPTION="Objective-C front end and runtime"
+  snapshot_print
+
+  SNAP_FILE=gcc-objc-${RELEASE}.tar.bz2
+  SNAP_DESCRIPTION="Java front end and runtime"
+  snapshot_print
+
+  SNAP_FILE=gcc-testsuite-${RELEASE}.tar.bz2
+  SNAP_DESCRIPTION="The GCC testsuite"
+  snapshot_print
+
+  echo -e "\nDiffs from "${BRANCH}"-"${LAST_DATE}" are available in the diffs/ subdirectory." \
+          "\n\nWhen a particular snapshot is ready for public consumption the LATEST-"${BRANCH} \
+          "\nlink is updated and a message is sent to the gcc list.  Please do not use" \
+          "\na snapshot before it has been announced that way." >> ${SNAPSHOT_README}
+
+  echo -e "</table>" \
+          "\n<p>Diffs from "${BRANCH}"-"${LAST_DATE}" are available in the" \
+          "\n<a href=\"diffs/\">diffs/ subdirectory</a>.</p>" \
+          "\n\n<p>When a particular snapshot is ready for public consumption the LATEST-"${BRANCH} \
+          "\nlink is updated and a message is sent to the gcc list.  Please do not use" \
+          "\na snapshot before it has been announced that way.</p>" \
+          "\n\n<hr />" \
+          "\n\n<address>" \
+          "\n<a href=\"mailto:gcc@gcc.gnu.org\">gcc@gcc.gnu.org</a>" \
+          "\n<br />" \
+          "\nLast modified "${TEXT_DATE} \
+          "\n</address>" \
+          "\n</body>" \
+          "\n\n</html>" >> ${SNAPSHOT_INDEX}
+
+  rm -f LATEST-${BRANCH}
+  ln -s ${RELEASE} LATEST-${BRANCH}
 
   inform "Sending mail"
 
   export QMAILHOST=gcc.gnu.org
-  mail -s "gcc-ss-${RELEASE} is now available" gcc@gcc.gnu.org < ${SNAPSHOTS_DIR}/${RELEASE}/README
+  mail -s "gcc-${RELEASE} is now available" gcc@gcc.gnu.org < ${SNAPSHOT_README}
 }
 
 ########################################################################
diff --git a/maintainer-scripts/snapshot-README b/maintainer-scripts/snapshot-README
deleted file mode 100644
index 77b49ac7ea7..00000000000
--- a/maintainer-scripts/snapshot-README
+++ /dev/null
@@ -1,34 +0,0 @@
-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 @BRANCH@ CVS branch
-with the following options: @EXPORT@
-
-You'll find:
-
-  gcc-@RELEASE@.tar.bz2              The full GCC snapshot, including all
-                                        languages and runtime libraries.
-
-  gcc-core-@RELEASE@.tar.bz2         Just the C front end and core compiler.
-
-  gcc-testsuite-@RELEASE@.tar.bz2    The GCC testsuite.
-
-  gcc-ada-@RELEASE@.tar.bz2          The Ada language and runtime.
-
-  gcc-g++-@RELEASE@.tar.bz2          The C++ front end and runtime.
-
-  gcc-g77-@RELEASE@.tar.bz2          The F77 front end and runtime.
-
-  gcc-fortran-@RELEASE@.tar.gz       The Fortran front end and runtime.
-
-  gcc-objc-@RELEASE@.tar.bz2         The Objective-C 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. 
-
-
-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.
diff --git a/maintainer-scripts/snapshot-index.html b/maintainer-scripts/snapshot-index.html
deleted file mode 100644
index de3859b7ac5..00000000000
--- a/maintainer-scripts/snapshot-index.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<html>
-
-<head>
-<title>GCC @RELEASE@ Snapshot</title>
-</head>
-
-<body>
-<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
-for testing purposes.</p>
-
-<p>If you are planning to download and use one of our snapshots, then
-we highly recommend you join the GCC developers list.  Details for
-how to sign up can be found on the GCC project home page.</p>
-
-<p>This snapshot has been generated from the GCC @BRANCH@ CVS branch
-with the following options: @EXPORT@</p>
-
-<blockquote>
-    <p> <a href="gcc-@RELEASE@.tar.bz2">
-	 gcc</a> @TEXT_DATE@ snapshot, includes all languages.
-
-    <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++-@RELEASE@.tar.bz2">
-	 gcc-g++</a> @TEXT_DATE@ snapshot, includes just the C++ front
-	 end and runtime.
-
-    <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-fortran-@RELEASE@.tar.bz2">
-	 gcc-fortran</a> @TEXT_DATE@ snapshot, includes just the Fortran front
-	 end and runtime.
-
-    <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-@RELEASE@.tar.bz2">
-	 gcc-objc</a> @TEXT_DATE@ snapshot, includes just the Objective-C
-	 front end and runtime.
-
-    <p> <a href="gcc-ada-@RELEASE@.tar.bz2">
-	 gcc-ada</a> @TEXT_DATE@ snapshot, includes just the Ada
-	 front end and runtime.
-
-</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>
-
-<hr />
-
-<address>
-<a href="mailto:gcc@gcc.gnu.org">gcc@gcc.gnu.org</a>
-<br />
-Last modified @TEXT_DATE@
-</address>
-</body>
-
-</html>
author	Kelley Cook <kcook@gcc.gnu.org>	2004-08-03 21:42:18 +0000
committer	Kelley Cook <kcook@gcc.gnu.org>	2004-08-03 21:42:18 +0000
commit	d4de8ff9018f98cc80fdc8e6fb896ac76eac530e (patch)
tree	480a24f193aeb977cf9e8f9c262a0c5923a5a77f /maintainer-scripts
parent	726eeafeb488f31d059248af4ce888c1a3940e9f (diff)