gcc_release: Correct handling of diff-generation.

	* gcc_release: Correct handling of diff-generation.  Add
	"diffs" major mode.

[[Split portion of a mixed commit.]]

From-SVN: r49951.1

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 9112eed4468457c5436093c7fe8e7f16c31ab3eb..8d9785392b993aa9ca651d7fae6186f4b9ac4f3f 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-21  Mark Mitchell  <mark@codesourcery.com>
+
+       * gcc_release: Correct handling of diff-generation.  Add
+       "diffs" major mode.
+
 2002-02-20  Release Manager
 
        * GCC 3.0.4 Released.

diff --git a/contrib/gcc_release b/contrib/gcc_release
index a4e4f83ddaa5d1d26a5aa11fce513c57011f4282..14e3015f8aa0193482ee437e8f6c3e1d0e7f8343 100755 (executable)
--- a/contrib/gcc_release
+++ b/contrib/gcc_release
@@ -9,7 +9,7 @@
 # Contents:
 #   Script to create a GCC release.
 #
-# Copyright (c) 2001 Free Software Foundation.
+# Copyright (c) 2001, 2002 Free Software Foundation.
 #
 # This file is part of GNU CC.
 #
@@ -282,13 +282,6 @@ build_tarfiles() {
   build_tarfile gcc-core-${RELEASE} ${EXCLUDES} \
     `basename ${SOURCE_DIRECTORY}`
 
-  # Possibly build diffs.
-  if [ -n "$OLD_TARS" ]; then
-    for old_tar in $OLD_TARS; do
-      build_diffs $old_tar
-    done
-  fi
-
   # Build .bz2 files.
   for f in ${FILE_LIST}; do
     bzfile=${f%.gz}.bz2
@@ -299,7 +292,7 @@ build_tarfiles() {
 
 # 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-}
@@ -338,13 +331,15 @@ upload_files() {
 
   changedir "${WORKING_DIRECTORY}"
 
+  # Make sure the directory exists on the server.
+  ${SSH} -l ${GCC_USERNAME} ${GCC_HOSTNAME} mkdir ${FTP_PATH}
   # Copy the tar files to the FTP server.
   for x in gcc*.gz gcc*.bz2; do
     if [ -e ${x} ]; then
       # Make sure the file will be readable on the server.
       chmod a+r ${x}
       # Copy it.
-      ${SCP} -p ${x} ${FTP_PATH} || \
+      ${SCP} -p ${x} "${GCC_USERNAME}@${GCC_HOSTNAME}:${FTP_PATH}" || \
         error "Could not upload ${x}"
     fi
   done
@@ -366,8 +361,12 @@ CVS_PROTOCOL="ext"
 # The username to use when connecting to the server.
 CVS_USERNAME="${USER}"
 
-# The path to the directory where the files are uploaded for FTP.
-FTP_PATH="gccadmin@gcc.gnu.org:~ftp/pub/gcc"
+# The machine to which files will be uploaded.
+GCC_HOSTNAME="gcc.gnu.org"
+# The name of the account on the machine to which files are uploaded.
+GCC_USERNAME="gccadmin"
+# The directory in which the files will be placed.
+FTP_PATH="~ftp/pub/gcc"
 
 # The major number for the release.  For release `3.0.2' this would be 
 # `3'
@@ -414,6 +413,7 @@ FINAL=0
 SNAPSHOT=0
 
 # Major operation modes.
+MODE_DIFFS=0
 MODE_SOURCES=0
 MODE_TARFILES=0
 MODE_UPLOAD=0
@@ -429,6 +429,7 @@ DIFF="${DIFF:-diff -Nrc3pad}"
 ENV="${ENV:-env}"
 GZIP="${GZIP:-gzip --best}"
 SCP="${SCP:-scp}"
+SSH="${SSH:-ssh}"
 TAR="${TAR:-tar}"
 
 ########################################################################
@@ -486,9 +487,9 @@ BRANCH="gcc-${RELEASE_MAJOR}_${RELEASE_MINOR}-branch"
 # If this is not a final release, set various parameters acordingly.
 if [ ${FINAL} -ne 1 ]; then
   RELEASE="${RELEASE}-${DATE}"
-  FTP_PATH="${FTP_PATH}/snapshots"
+  FTP_PATH="${FTP_PATH}/snapshots/"
 else
-  FTP_PATH="${FTP_PATH}/releases/gcc-${RELEASE}"
+  FTP_PATH="${FTP_PATH}/releases/gcc-${RELEASE}/"
 fi
 
 # Compute the name of the WORKING_DIRECTORY and the SOURCE_DIRECTORY.
@@ -515,6 +516,7 @@ export CVSROOT
 # Handle the major modes.
 while [ $# -ne 0 ]; do
     case $1 in
+    diffs)    MODE_DIFFS=1;;
     sources)  MODE_SOURCES=1;;
     tarfiles) MODE_TARFILES=1;;
     upload)   MODE_UPLOAD=1;;
@@ -536,6 +538,17 @@ if [ $MODE_TARFILES -ne 0 ]; then
   build_tarfiles
 fi
 
+# Build diffs
+
+if [ $MODE_DIFFS -ne 0 ]; then
+  # Possibly build diffs.
+  if [ -n "$OLD_TARS" ]; then
+    for old_tar in $OLD_TARS; do
+      build_diffs $old_tar
+    done
+  fi
+fi
+
 # Upload them to the FTP server.
 
 if [ $MODE_UPLOAD -ne 0 ]; then