From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-return-74984-listarch-gcc=gcc.gnu.org@gcc.gnu.org>
Received: (qmail 31674 invoked by alias); 23 May 2003 22:57:53 -0000
Mailing-List: contact gcc-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Archive: <http://gcc.gnu.org/ml/gcc/>
List-Post: <mailto:gcc@gcc.gnu.org>
List-Help: <http://gcc.gnu.org/ml/>
Sender: gcc-owner@gcc.gnu.org
Received: (qmail 31658 invoked from network); 23 May 2003 22:57:52 -0000
Received: from unknown (HELO vexpert.dbai.tuwien.ac.at) (128.131.111.2)
  by sources.redhat.com with SMTP; 23 May 2003 22:57:52 -0000
Received: from [128.131.111.60] (acrux [128.131.111.60])
	by vexpert.dbai.tuwien.ac.at (Postfix) with ESMTP
	id 92E8013787; Sat, 24 May 2003 00:57:50 +0200 (CEST)
Date: Fri, 23 May 2003 22:59:00 -0000
From: Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
To: Mark Mitchell <mark@codesourcery.com>,
	"Joseph S. Myers" <jsm28@cam.ac.uk>
Cc: Jie Zhang <zhangjie@magima.com.cn>, gcc@gcc.gnu.org,
	gcc-patches@gcc.gnu.org
Subject: Re: GCC 3.3 Released
In-Reply-To: <Pine.LNX.4.53.0305152314510.14207@kern.srcf.societies.cam.ac.uk>
Message-ID: <Pine.BSF.4.55.0305240052070.61698@acrux.dbai.tuwien.ac.at>
References: <200305142345.h4ENjScJ002366@doubledemon.codesourcery.com>
 <3EC31DB2.3090300@magima.com.cn> <Pine.BSF.4.55.0305151627110.16396@naos.dbai.tuwien.ac.at>
 <Pine.LNX.4.53.0305152314510.14207@kern.srcf.societies.cam.ac.uk>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-SW-Source: 2003-05/txt/msg02155.txt.bz2

On Thu, 15 May 2003, Mark Mitchell wrote:
>>> There are four entries for GCC 3.3 release in all ChangeLogs. Like this:
> Let's give it a try.  Please put it on the mainline.  If you would,
> would you also updates release.html to say "For the GCC 3.4 release,
> verify that at least one ChangeLog entry has been created by the release
> script?"  I'll remove that once 3.4 is out.

I have now committed the modified patch below...

On Thu, 15 May 2003, Joseph S. Myers wrote:
> You can test this sort of thing against an rsynced copy of the repository
> (so it needn't wait for 3.4 to come into effect, or require any artificial
> extra entries on the release instructions).

...and verified the patch by repeatedly running the script for GCC 3.3.9
and 3.3.10 (locally, of course <g>).

Mark, do you want the note in releasing.html nevertheless?  And should
this go to the 3.3-branch as well to avoid duplicate ChangeLog entries
there?

Gerald

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

	* gcc_release (build_sources): Only update ChangeLog files which
	do not yet contain the entry we are going to add.
	Fix typo in added ChangeLog entries.

Index: gcc_release
===================================================================
RCS file: /cvs/gcc/gcc/maintainer-scripts/gcc_release,v
retrieving revision 1.24
diff -u -5 -p -r1.24 gcc_release
--- gcc_release	20 May 2003 11:47:50 -0000	1.24
+++ gcc_release	23 May 2003 22:51:28 -0000
@@ -120,21 +120,26 @@ build_sources() {

     ${CVS} co -d "`basename ${SOURCE_DIRECTORY}`" \
            -r ${BRANCH} gcc || \
            error "Could not check out release sources"
     for x in `find ${SOURCE_DIRECTORY} -name ChangeLog`; do
-      cat - ${x} > ${x}.new <<EOF
+      # Update this ChangeLog file only if it does not yet contain the
+      # entry we are going to add.  (This is a safety net for repeated
+      # runs of this script for the same release.)
+      if ! grep "GCC ${RELEASE} released." ${x} > /dev/null ; then
+        cat - ${x} > ${x}.new <<EOF
 ${LONG_DATE}  Release Manager

-	* GCC ${RELEASE} Released.
+	* GCC ${RELEASE} released.

 EOF
-      mv ${x}.new ${x} || \
-        error "Could not update ${x}"
-      (changedir `dirname ${x}` && \
-        ${CVS} ci -m 'Mark ChangeLog' `basename ${x}`) || \
-        error "Could not commit ${x}"
+        mv ${x}.new ${x} || \
+            error "Could not update ${x}"
+        (changedir `dirname ${x}` && \
+            ${CVS} ci -m 'Mark ChangeLog' `basename ${x}`) || \
+            error "Could not commit ${x}"
+      fi
     done

     # Update `gcc/version.c'.
     for x in gcc/version.c; do
       y=`basename ${x}`