Today's snapshot

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

This is just a heads-up: in case there are problems with today's snapshot,
it's most probably my fault.

I made the following change to our snapshot script on gcc.gnu.org (but
did not committed it to CVS yet).

The patch has been tested locally against an rsynced repository, which
wasn't particularily funny, as the script does have it's dark corners and
along the way I also triggered a cvs bug. :-(

Anyway, no user visible changes apart from the fact that we now generate
.bz2 and (only if requested) .gz from that, and that the working directory
won't be removed to ease debugging.

Gerald

Index: gcc_release
===================================================================
RCS file: /cvs/gcc/gcc/maintainer-scripts/gcc_release,v
retrieving revision 1.25
diff -u -3 -p -r1.25 gcc_release
--- gcc_release	23 May 2003 22:55:50 -0000	1.25
+++ gcc_release	26 May 2003 15:17:32 -0000
@@ -245,11 +245,11 @@ EOF

 build_tarfile() {
   # Get the name of the destination tar file.
-  TARFILE="$1.tar.gz"
+  TARFILE="$1.tar.bz2"
   shift

   # Build the tar file itself.
-  (${TAR} cf - "$@" | ${GZIP} > ${TARFILE}) || \
+  (${TAR} cf - "$@" | ${BZIP2} > ${TARFILE}) || \
     error "Could not build tarfile"
   FILE_LIST="${FILE_LIST} ${TARFILE}"
 }
@@ -288,11 +288,11 @@ build_tarfiles() {
     `basename ${SOURCE_DIRECTORY}`
 }

-# Build .bz2 files.
-build_bzip2() {
+# Build .gz files.
+build_gzip() {
   for f in ${FILE_LIST}; do
-    bzfile=${f%.gz}.bz2
-    (zcat $f | ${BZIP2} > ${bzfile}) || error "Could not create ${bzfile}"
+    bzfile=${f%.bz2}.gz
+    (${BZIP2} -d -c $f | ${GZIP} > ${bzfile}) || error "Could not create ${bzfile}"
   done
 }

@@ -325,7 +325,7 @@ build_diff() {
   if [ $? -eq 2 ]; then
     error "Trouble making diffs from $1 to $3"
   fi
-  ${GZIP} ../${5%.gz} || error "Could not gzip ../${5%.gz}"
+  ${BZIP2} ../${5%.bz2} || error "Could not compress ../${5%}"
   changedir ..
   rm -rf $tmpdir
   FILE_LIST="${FILE_LIST} $5"
@@ -442,13 +442,13 @@ SNAPSHOT=0
 LOCAL=0

 # Major operation modes.
-MODE_BZIP2=0
+MODE_GZIP=0
 MODE_DIFFS=0
 MODE_SOURCES=0
 MODE_TARFILES=0
 MODE_UPLOAD=0

-# .gz files generated to create .bz2 files from.
+# List of archive files generated; used to create .gz files from .bz2.
 FILE_LIST=""

 # Programs we use.
@@ -579,12 +579,12 @@ export TZ
 # Handle the major modes.
 while [ $# -ne 0 ]; do
     case $1 in
-    bzip2)    MODE_BZIP2=1;;
     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_BZIP2=1; MODE_UPLOAD=1;;
+    all)      MODE_SOURCES=1; MODE_TARFILES=1; MODE_DIFFS=1; MODE_GZIP=1; MODE_UPLOAD=1;;
     *)        error "Unknown mode $1";;
     esac
     shift
@@ -613,9 +613,9 @@ if [ $MODE_DIFFS -ne 0 ]; then
   fi
 fi

-# Build bzip2 files
-if [ $MODE_BZIP2 -ne 0 ]; then
-  build_bzip2
+# Build gzip files
+if [ $MODE_GZIP -ne 0 ]; then
+  build_gzip
 fi

 # Upload them to the FTP server.
@@ -653,6 +653,7 @@ if [ $MODE_UPLOAD -ne 0 ]; then
     mail -s "gcc-ss-$DATE is now available" gcc@gcc.gnu.org < ~ftp/pub/gcc/snapshots/README

     # Remove working directory
-    rm -rf ${WORKING_DIRECTORY}
+    # FIXME/TODO: disabled for debugging purposes!
+    # rm -rf ${WORKING_DIRECTORY}
   fi
 fi