Today's snapshot

Today's snapshot

[Gerald Pfeifer]

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

Re: Today's snapshot

[Ranjit Mathew]

Gerald Pfeifer wrote:
> 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.

I just checked ftp://gcc.gnu.org/ and my favourite mirror
for snapshots http://mirrors.rcn.net/pub/sourceware/gcc/snapshots/
and find that:

1. The "diffs" folder is empty.

2. Both bz2 and gz files are present.
    (So gzip was indeed "requested" this time.)

BTW, we use "gzip --best" but only vanilla "bzip2" - would it
not be better if we use "bzip2 -9" as well?


> +# 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
        ^^^^^^

Should it not be "gzfile"?

Thank you for making these changes - consider me one of the
most ardent cheerleaders for this enterprise. ;-)

Ranjit.

-- 
Ranjit Mathew          Email: rmathew AT hotmail DOT com

Bangalore, INDIA.      Web: http://ranjitmathew.tripod.com/

Re: Today's snapshot

[Gerald Pfeifer]

On Tue, 27 May 2003, Ranjit Mathew wrote:
> 1. The "diffs" folder is empty.

This is true, and was due to a bug in my changes (and a minor design
issue with the script as well as weak error handling).

I have fixed this manually -- would you mind testing whether the diff
files (.bz2 only) are okay?

> 2. Both bz2 and gz files are present.
>     (So gzip was indeed "requested" this time.)

Yes, this was intentional.  I'm making small steps to reduce the risk
of breaking this delicate script.
>
> BTW, we use "gzip --best" but only vanilla "bzip2" - would it
> not be better if we use "bzip2 -9" as well?

No, it wouldn't make a difference:

   -1 (or --fast) to -9 (or --best)
          Set  the  block size to 100 k, 200 k ..  900 k when compressing.
          Has no effect when decompressing.  See MEMORY MANAGEMENT  below.
          The --fast and --best aliases are primarily for GNU gzip compat-
          ibility.  In particular, --fast  doesn't  make  things  signifi-
          cantly faster.  And --best merely selects the default behaviour.

> > +# 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
>         ^^^^^^
> Should it not be "gzfile"?

I have renamed this to target now.

> Thank you for making these changes - consider me one of the most ardent
> cheerleaders for this enterprise. ;-)

Send pictures. :-)

Gerald

PS: My plan is now to make improvements to the error handling (and fix
the minor bug that prevented generation of the diffs).  Should next
week's snapshot work out fine, I'll disable generation of .gz files for
snapshots and proceed with adding the major release as part of snapshot
directories and filenames.
-- 
Gerald "Jerry"   pfeifer@dbai.tuwien.ac.at   http://www.pfeifer.com/gerald/

Re: Today's snapshot

[Joseph S. Myers]

On Tue, 27 May 2003, Gerald Pfeifer wrote:

> PS: My plan is now to make improvements to the error handling (and fix
> the minor bug that prevented generation of the diffs).  Should next
> week's snapshot work out fine, I'll disable generation of .gz files for
> snapshots and proceed with adding the major release as part of snapshot
> directories and filenames.

Note that snapshot-README and snapshot-index.html also need updating to
point to the .bz2 files, and to the diffs directory for diffs.

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

Re: Today's snapshot

[Ranjit Mathew]

>>1. The "diffs" folder is empty.
> 
> 
> This is true, and was due to a bug in my changes (and a minor design
> issue with the script as well as weak error handling).
> 
> I have fixed this manually -- would you mind testing whether the diff
> files (.bz2 only) are okay?

They are "okay" to the extent that the diffs between
2003-05-19 and 2003-05-26 apply cleanly to a 2003-05-19
tree (core,g++,java). The "java" diffs is empty - perhaps
because nothing was checked in for 3.3.1 this week.

Thanks once again.

Ranjit.

-- 
Ranjit Mathew          Email: rmathew AT hotmail DOT com

Bangalore, INDIA.      Web: http://ranjitmathew.tripod.com/

Re: Today's snapshot

[Gerald Pfeifer]

On Tue, 27 May 2003, Joseph S. Myers wrote:
> Note that snapshot-README and snapshot-index.html also need updating to
> point to the .bz2 files, and to the diffs directory for diffs.

Right; I just wanted to wait for the snapshot to suceed.

The change below
 - changes the references from .gz to .bz2,
 - adds a note on where to find the diff files (which is an improvement),
 - simplifies the note on not using unannounced snapshots, and
 - removes documentation of the gcc_latest_snapshot tag.

Gerald

--- README.orig	2003-05-26 16:57:37.000000000 +0000
+++ README	2003-05-28 10:40:37.000000000 +0000
@@ -7,26 +7,22 @@ This snapshot has been generated from th
 You'll find:

-  gcc-20030526.tar.gz                  The full gcc snapshot, including all
+  gcc-20030526.tar.bz2                 The full gcc snapshot, including all
                                        languages runtime libraries.

-  gcc-core-20030526.tar.gz             Just the C front end and core compiler.
+  gcc-core-20030526.tar.bz2            Just the C front end and core compiler.

-  gcc-testsuite-20030526.tar.gz        The GCC testsuite.
+  gcc-testsuite-20030526.tar.bz2       The GCC testsuite.

-  gcc-ada-20030526.tar.gz              The Ada language and runtime.
+  gcc-ada-20030526.tar.bz2             The Ada language and runtime.

-  gcc-g++-20030526.tar.gz              The g++ language and runtime.
+  gcc-g++-20030526.tar.bz2             The g++ language and runtime.

-  gcc-g77-20030526.tar.gz              The g77 language and runtime.
+  gcc-g77-20030526.tar.bz2             The g77 language and runtime.

-  gcc-objc-20030526.tar.gz             The Objective-C front end and runtime.
+  gcc-objc-20030526.tar.bz2            The Objective-C front end and runtime.

-  gcc-java-20030526.tar.gz             The Java front end.
+  gcc-java-20030526.tar.bz2            The Java front end.

-Diffs from 20030519 are available.
-
-Note at times you may find newer directories on the server with limited
-permissions.  These represent snapshots that have not yet been verified
-as correct, or are known to be incorrect.
+Diffs from 20030519 are available in the diffs/ subdirectory.

 When a particular snapshot is ready for public consumption the directory
@@ -36,6 +32,2 @@ sent to the gcc list.
 Using a snapshot before it's officially made available is an unwise thing
 to do since it may become impossible to update to an official snapshot.
-
-The "gcc_latest_snapshot" tag has been moved.  You can use
-cvs update -rgcc_latest_snapshot to update your CVS tree to the latest
-official snapshot.

Re: Today's snapshot

[Joseph S. Myers]

On Wed, 28 May 2003, Gerald Pfeifer wrote:

> The change below
>  - changes the references from .gz to .bz2,
>  - adds a note on where to find the diff files (which is an improvement),
>  - simplifies the note on not using unannounced snapshots, and
>  - removes documentation of the gcc_latest_snapshot tag.

But that's not the file to patch: it's snapshot-README and
snapshot-index.html in CVS that are to be patched, not the generated files
on the FTP site.

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

PATCH for Re: Today's snapshot

[Gerald Pfeifer]

On Wed, 28 May 2003, Joseph S. Myers wrote:
> But that's not the file to patch: it's snapshot-README and
> snapshot-index.html in CVS that are to be patched, not the generated
> files on the FTP site.

Sheesh, I forget that you cleaned that up. :-(

2003-05-28  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>

	* snapshot-README: Refer to .bz2 files instead of .gz files.
	Add a note on where to find the diff files.
	Simplify the note on not using unannounced snapshots.
	Remove documentation of the gcc_latest_snapshot tag.

Index: snapshot-README
===================================================================
RCS file: /cvs/gcc/gcc/maintainer-scripts/snapshot-README,v
retrieving revision 1.7
diff -u -3 -p -r1.7 snapshot-README
--- snapshot-README	16 Dec 2002 22:18:33 -0000	1.7
+++ snapshot-README	28 May 2003 11:22:05 -0000
@@ -6,36 +6,26 @@ This snapshot has been generated from th

 You'll find:

-  gcc-@DATE@.tar.gz                  The full gcc snapshot, including all
+  gcc-@DATE@.tar.bz2                 The full gcc snapshot, including all
                                        languages runtime libraries.

-  gcc-core-@DATE@.tar.gz             Just the C front end and core compiler.
+  gcc-core-@DATE@.tar.bz2            Just the C front end and core compiler.

-  gcc-testsuite-@DATE@.tar.gz        The GCC testsuite.
+  gcc-testsuite-@DATE@.tar.bz2       The GCC testsuite.

-  gcc-ada-@DATE@.tar.gz              The Ada language and runtime.
+  gcc-ada-@DATE@.tar.bz2             The Ada language and runtime.

-  gcc-g++-@DATE@.tar.gz              The g++ language and runtime.
+  gcc-g++-@DATE@.tar.bz2             The g++ language and runtime.

-  gcc-g77-@DATE@.tar.gz              The g77 language and runtime.
+  gcc-g77-@DATE@.tar.bz2             The g77 language and runtime.

-  gcc-objc-@DATE@.tar.gz             The Objective-C front end and runtime.
+  gcc-objc-@DATE@.tar.bz2            The Objective-C front end and runtime.

-  gcc-java-@DATE@.tar.gz             The Java front end.
+  gcc-java-@DATE@.tar.bz2            The Java front end.

-Diffs from @LAST_DATE@ are available.
+Diffs from @LAST_DATE@ are available in the diffs/ subdirectory.

-Note at times you may find newer directories on the server with limited
-permissions.  These represent snapshots that have not yet been verified
-as correct, or are known to be incorrect.

-When a particular snapshot is ready for public consumption the directory
-permissions are relaxed, the LATEST-IS- file is updated and a message is
-sent to the gcc list.
-
-Using a snapshot before it's officially made available is an unwise thing
-to do since it may become impossible to update to an official snapshot.
-
-The "gcc_latest_snapshot" tag has been moved.  You can use
-cvs update -rgcc_latest_snapshot to update your CVS tree to the latest
-official snapshot.
+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.