You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/06/09 03:33:45 UTC
svn commit: r1348294 - in /lucene/dev/trunk: ./ lucene/ lucene/site/
lucene/site/changes/changes2html.pl
Author: rmuir
Date: Sat Jun 9 01:33:45 2012
New Revision: 1348294
URL: http://svn.apache.org/viewvc?rev=1348294&view=rev
Log:
fix changes2html to allow for -ALPHA or -BETA releases
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/lucene/ (props changed)
lucene/dev/trunk/lucene/site/ (props changed)
lucene/dev/trunk/lucene/site/changes/changes2html.pl
Modified: lucene/dev/trunk/lucene/site/changes/changes2html.pl
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/site/changes/changes2html.pl?rev=1348294&r1=1348293&r2=1348294&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/site/changes/changes2html.pl (original)
+++ lucene/dev/trunk/lucene/site/changes/changes2html.pl Sat Jun 9 01:33:45 2012
@@ -64,7 +64,8 @@ for (my $line_num = 0 ; $line_num <= $#l
if (/\s*===+\s*(.*?)\s*===+\s*/) { # New-style release headings
$release = $1;
$release =~ s/^(?:release|lucene)\s*//i; # Trim "Release " or "Lucene " prefix
- ($release, $relinfo) = ($release =~ /^(\d+(?:\.(?:\d+|[xyz]))*|Trunk)\s*(.*)/i);
+ ($release, $relinfo) = ($release =~ /^(\d+(?:\.(?:\d+(\-ALPHA|\-BETA)?|[xyz]))*|Trunk)\s*(.*)/i);
+ $relinfo =~ s/(\-ALPHA|\-BETA)//; # Trim -ALPHA or -BETA to only be in release (TODO: please fix the above regex instead!)
$relinfo =~ s/\s*:\s*$//; # Trim trailing colon
$relinfo =~ s/^\s*,\s*//; # Trim leading comma
($reldate, $relinfo) = get_release_date($release, $relinfo);
RE: svn commit: r1348294 - in /lucene/dev/trunk: ./ lucene/
lucene/site/ lucene/site/changes/changes2html.pl
Posted by Steven A Rowe <sa...@syr.edu>.
Thanks for the heads-up, Robert - I simplified the regex a little and it still seems to work. - Steve
-----Original Message-----
From: Robert Muir [mailto:rcmuir@gmail.com]
Sent: Saturday, June 09, 2012 7:08 AM
To: dev@lucene.apache.org
Subject: Re: svn commit: r1348294 - in /lucene/dev/trunk: ./ lucene/ lucene/site/ lucene/site/changes/changes2html.pl
This change should probably be reviewed by someone with more regexp skills than me.
I made it work and the html looks correct but its kinda hackish.
On Fri, Jun 8, 2012 at 9:33 PM, <rm...@apache.org> wrote:
> Author: rmuir
> Date: Sat Jun 9 01:33:45 2012
> New Revision: 1348294
>
> URL: http://svn.apache.org/viewvc?rev=1348294&view=rev
> Log:
> fix changes2html to allow for -ALPHA or -BETA releases
>
> Modified:
> lucene/dev/trunk/ (props changed)
> lucene/dev/trunk/lucene/ (props changed)
> lucene/dev/trunk/lucene/site/ (props changed)
> lucene/dev/trunk/lucene/site/changes/changes2html.pl
>
> Modified: lucene/dev/trunk/lucene/site/changes/changes2html.pl
> URL:
> http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/site/changes/chan
> ges2html.pl?rev=1348294&r1=1348293&r2=1348294&view=diff
> ======================================================================
> ========
> --- lucene/dev/trunk/lucene/site/changes/changes2html.pl (original)
> +++ lucene/dev/trunk/lucene/site/changes/changes2html.pl Sat Jun 9
> +++ 01:33:45 2012
> @@ -64,7 +64,8 @@ for (my $line_num = 0 ; $line_num <= $#l
> if (/\s*===+\s*(.*?)\s*===+\s*/) { # New-style release headings
> $release = $1;
> $release =~ s/^(?:release|lucene)\s*//i; # Trim "Release " or
> "Lucene " prefix
> - ($release, $relinfo) = ($release =~
> /^(\d+(?:\.(?:\d+|[xyz]))*|Trunk)\s*(.*)/i);
> + ($release, $relinfo) = ($release =~
> + /^(\d+(?:\.(?:\d+(\-ALPHA|\-BETA)?|[xyz]))*|Trunk)\s*(.*)/i);
> + $relinfo =~ s/(\-ALPHA|\-BETA)//; # Trim -ALPHA or -BETA to only
> + be in release (TODO: please fix the above regex instead!)
> $relinfo =~ s/\s*:\s*$//; # Trim trailing colon
> $relinfo =~ s/^\s*,\s*//; # Trim leading comma
> ($reldate, $relinfo) = get_release_date($release, $relinfo);
>
>
Re: svn commit: r1348294 - in /lucene/dev/trunk: ./ lucene/
lucene/site/ lucene/site/changes/changes2html.pl
Posted by Robert Muir <rc...@gmail.com>.
This change should probably be reviewed by someone with more regexp
skills than me.
I made it work and the html looks correct but its kinda hackish.
On Fri, Jun 8, 2012 at 9:33 PM, <rm...@apache.org> wrote:
> Author: rmuir
> Date: Sat Jun 9 01:33:45 2012
> New Revision: 1348294
>
> URL: http://svn.apache.org/viewvc?rev=1348294&view=rev
> Log:
> fix changes2html to allow for -ALPHA or -BETA releases
>
> Modified:
> lucene/dev/trunk/ (props changed)
> lucene/dev/trunk/lucene/ (props changed)
> lucene/dev/trunk/lucene/site/ (props changed)
> lucene/dev/trunk/lucene/site/changes/changes2html.pl
>
> Modified: lucene/dev/trunk/lucene/site/changes/changes2html.pl
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/site/changes/changes2html.pl?rev=1348294&r1=1348293&r2=1348294&view=diff
> ==============================================================================
> --- lucene/dev/trunk/lucene/site/changes/changes2html.pl (original)
> +++ lucene/dev/trunk/lucene/site/changes/changes2html.pl Sat Jun 9 01:33:45 2012
> @@ -64,7 +64,8 @@ for (my $line_num = 0 ; $line_num <= $#l
> if (/\s*===+\s*(.*?)\s*===+\s*/) { # New-style release headings
> $release = $1;
> $release =~ s/^(?:release|lucene)\s*//i; # Trim "Release " or "Lucene " prefix
> - ($release, $relinfo) = ($release =~ /^(\d+(?:\.(?:\d+|[xyz]))*|Trunk)\s*(.*)/i);
> + ($release, $relinfo) = ($release =~ /^(\d+(?:\.(?:\d+(\-ALPHA|\-BETA)?|[xyz]))*|Trunk)\s*(.*)/i);
> + $relinfo =~ s/(\-ALPHA|\-BETA)//; # Trim -ALPHA or -BETA to only be in release (TODO: please fix the above regex instead!)
> $relinfo =~ s/\s*:\s*$//; # Trim trailing colon
> $relinfo =~ s/^\s*,\s*//; # Trim leading comma
> ($reldate, $relinfo) = get_release_date($release, $relinfo);
>
>
--
lucidimagination.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org