Re: RFR: Fix Change Summary generator

2013-12-06 Thread Jiri Vanek

On 11/14/2013 12:47 AM, Omair Majid wrote:

Hi,

The attached patch fixes the Change Summary generator included in
openjdk6. OPENDJDK6-* bugs are now generated too. I have included the
update summary page that is generated with this patch (for b27 to b28
jump, compare with [1]).

I will wait for all the security patches to be added before pushing
this, assuming this patch looks okay.

Thanks,
Omair

[1]https://openjdk6.java.net/OpenJDK6-B28-Changes.html


fix-report-generator.patch


diff --git a/make/scripts/jdkreport.pl b/make/scripts/jdkreport.pl
--- a/make/scripts/jdkreport.pl
+++ b/make/scripts/jdkreport.pl
@@ -70,7 +70,12 @@
   foreach(@bugs) {
 ($bugid, $desc) = split ':',$_, 2; # limit the number of splits to 2
 $bugid =~ s/^\s+//; #remove leading white spaces
-   $url ="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=$bugid";;
+
+   if ($bugid =~ /^OPENJDK6-/) { # use different urls for different bugs
+ $url ="http:/java.net/jira/browse/$bugid";
+   } else {
+ $url ="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=$bugid";;
+   }

 if($firstbug) {
   $firstbug = 0;
@@ -108,7 +113,7 @@
   chomp($changeset); #remove end of line
 }

-   if(/^\d+:/) { #match lines that start with numbers (bugids)
+   if(/^(OPENJDK6-)?\d+:/) { #match lines that start with numbers (bugids)
   push(@bugs, $_);
 }
   }


changelog.html




I'm not full time reviewer, but except one nit the changes looks ok.

In second hunk, the comment is no longer valid, it ssould be:
+   if(/^(OPENJDK6-)?\d+:/) { #match lines that start with OPENJDK5-  or with 
numbers (both bugids)


So from my "watcher's" position ok to go after fixed comment.

Thankx for keeping jdk6 alive!

 J.


Re: RFR: Fix Change Summary generator

2013-12-06 Thread Andrew
- Original Message -
> On 11/14/2013 12:47 AM, Omair Majid wrote:
> > Hi,
> >
> > The attached patch fixes the Change Summary generator included in
> > openjdk6. OPENDJDK6-* bugs are now generated too. I have included the
> > update summary page that is generated with this patch (for b27 to b28
> > jump, compare with [1]).
> >
> > I will wait for all the security patches to be added before pushing
> > this, assuming this patch looks okay.
> >
> > Thanks,
> > Omair
> >
> > [1]https://openjdk6.java.net/OpenJDK6-B28-Changes.html
> >
> >
> > fix-report-generator.patch
> >
> >
> > diff --git a/make/scripts/jdkreport.pl b/make/scripts/jdkreport.pl
> > --- a/make/scripts/jdkreport.pl
> > +++ b/make/scripts/jdkreport.pl
> > @@ -70,7 +70,12 @@
> >foreach(@bugs) {
> >  ($bugid, $desc) = split ':',$_, 2; # limit the number of splits to 2
> >  $bugid =~ s/^\s+//; #remove leading white spaces
> > -   $url ="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=$bugid";;
> > +
> > +   if ($bugid =~ /^OPENJDK6-/) { # use different urls for different bugs
> > + $url ="http:/java.net/jira/browse/$bugid";
> > +   } else {
> > + $url ="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=$bugid";;
> > +   }
> >
> >  if($firstbug) {
> >$firstbug = 0;
> > @@ -108,7 +113,7 @@
> >chomp($changeset); #remove end of line
> >  }
> >
> > -   if(/^\d+:/) { #match lines that start with numbers (bugids)
> > +   if(/^(OPENJDK6-)?\d+:/) { #match lines that start with numbers (bugids)
> >push(@bugs, $_);
> >  }
> >}
> >
> >
> > changelog.html
> >
> >
> >
> I'm not full time reviewer, but except one nit the changes looks ok.
> 

You're not a reviewer at all, in the OpenJDK sense.  Sorry.

> In second hunk, the comment is no longer valid, it ssould be:
> +   if(/^(OPENJDK6-)?\d+:/) { #match lines that start with OPENJDK5-  or with
> numbers (both bugids)
> 
> 
> So from my "watcher's" position ok to go after fixed comment.
> 
> Thankx for keeping jdk6 alive!
> 
>   J.
> 

I didn't realise you'd posted this or that the script was part of OpenJDK 
itself.
I did ok it informally before and do so now formally.
-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07



hg: jdk6/jdk6: OPENJDK6-24: Fix change summary generator

2013-12-06 Thread omajid
Changeset: 0ee0e8c81e3d
Author:omajid
Date:  2013-12-06 13:03 -0500
URL:   http://hg.openjdk.java.net/jdk6/jdk6/rev/0ee0e8c81e3d

OPENJDK6-24: Fix change summary generator
Reviewed-by: andrew

! make/scripts/jdkreport.pl