Re: PATCH: Correct diff-generation in release scripts

["Joseph S. Myers" <jsm28 at cam dot ac dot uk>]

On Sat, 23 Feb 2002, Mark Mitchell wrote:

> Please just revert my change on the mainline and update releasing.html
> to indicate what to do.

I've applied the following patch.  Tested by running a snapshot.

Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/maintainer-scripts/ChangeLog,v
retrieving revision 1.30
diff -u -r1.30 ChangeLog
--- ChangeLog	2002/02/22 01:52:35	1.30
+++ ChangeLog	2002/02/23 23:08:30
@@ -1,3 +1,9 @@
+2002-02-23  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* gcc_release: Revert change to -p interface.  Allow for local and
+	remote cases in creating directories.  Give an error if -p
+	argument names a directory.
+
 2002-02-21  Mark Mitchell  <mark@codesourcery.com>
 
 	* gcc_release: Correct handling of diff-generation.  Add
Index: gcc_release
===================================================================
RCS file: /cvs/gcc/gcc/maintainer-scripts/gcc_release,v
retrieving revision 1.7
diff -u -r1.7 gcc_release
--- gcc_release	2002/02/22 01:54:37	1.7
+++ gcc_release	2002/02/23 23:08:30
@@ -294,7 +294,7 @@
 
 # Build diffs against an old release.
 build_diffs() {
-  old_dir=${1%/}
+  old_dir=${1%/*}
   old_file=${1##*/}
   old_vers=${old_file%.tar.gz}
   old_vers=${old_vers#gcc-}
@@ -334,13 +334,14 @@
 
   changedir "${WORKING_DIRECTORY}"
 
-  if [ $LOCAL -ne 0 ]; then
+  # Make sure the directory exists on the server.
+  if [ $LOCAL -eq 0 ]; then
+    ${SSH} -l ${GCC_USERNAME} ${GCC_HOSTNAME} mkdir ${FTP_PATH}
+  else
     mkdir -p "${FTP_PATH}" \
       || error "Could not create \`${FTP_PATH}'"
   fi
 
-  # Make sure the directory exists on the server.
-  ${SSH} -l ${GCC_USERNAME} ${GCC_HOSTNAME} mkdir ${FTP_PATH}
   for x in gcc*.gz gcc*.bz2; do
     if [ -e ${x} ]; then
       # Make sure the file will be readable on the server.
@@ -463,7 +464,10 @@
 	  SCP=cp
 	  FTP_PATH=~ftp/pub/gcc
 	  PATH=~:/usr/local/bin:$PATH;;
-    p)    OLD_TARS="${OLD_TARS} ${OPTARG}";;
+    p)    OLD_TARS="${OLD_TARS} ${OPTARG}"
+          if [ -d ${OPTARG} ]; then
+	    error "-p argument must name a tarball"
+	  fi;;
     \?)   usage;;
     esac
 done
Index: releasing.html
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/releasing.html,v
retrieving revision 1.6
diff -u -r1.6 releasing.html
--- releasing.html	2002/01/25 23:23:25	1.6
+++ releasing.html	2002/02/23 23:15:08
@@ -20,6 +20,18 @@
 <li>For a new major release, ensure that the build status page is
 present.</li>
 
+<li>Roll the release using the
+<code>maintainer-scripts/gcc_release</code> script.  You must pass the
+<code>-f</code> option, to indicate a final release, the
+<code>-r</code> option (for example, <code>-r 3.1</code>), to give the
+release version, and, if diffs against a previous release are to be
+generated, the <code>-p</code> option, whose argument must name the
+<code>.tar.gz</code> file for a previous release, in a directory
+containing all the <code>.tar.gz</code> files for that previous
+release (for example, <code>-p
+/some/where/gcc-3.1/gcc-3.1.tar.gz</code>, where there are also files
+such as <code>/some/where/gcc-3.1/gcc-core-3.1.tar.gz</code>).</li>
+
 <li>Update the <code>releases.html</code> web page.</li>
 
 <li>Update the version numbers of the current and future releases on

-- 
Joseph S. Myers
jsm28@cam.ac.uk