Index: lucene/benchmark/build.xml =================================================================== --- lucene/benchmark/build.xml (revision 1390348) +++ lucene/benchmark/build.xml (working copy) @@ -220,7 +220,7 @@ Benchmark output is in file: ${collation.output.file} Converting to JIRA table format... - + @@ -246,7 +246,7 @@ Benchmark output is in file: ${shingle.output.file} Converting to JIRA table format... - + Index: lucene/build.xml =================================================================== --- lucene/build.xml (revision 1390348) +++ lucene/build.xml (working copy) @@ -416,7 +416,7 @@ + changes.target.dir="${svn.export.dir}/docs/changes" changes.product="LUCENE"/> @@ -507,7 +507,7 @@ - + Index: lucene/common-build.xml =================================================================== --- lucene/common-build.xml (revision 1390348) +++ lucene/common-build.xml (working copy) @@ -209,6 +209,7 @@ --> + @@ -1351,7 +1352,7 @@ - + @@ -1889,14 +1890,20 @@ compile changes.txt into an html file --> + - + + + + Index: lucene/site/changes/changes2html.pl =================================================================== --- lucene/site/changes/changes2html.pl (revision 1390348) +++ lucene/site/changes/changes2html.pl (working copy) @@ -41,17 +41,10 @@ my $second_relid = undef; my @releases = (); -my @lines = <>; # Get all input at once +my @lines = ; # Get all input at once -my $product = ''; -for my $line (@lines) { - ($product) = $line =~ /(Solr|Lucene)/i; - if ($product) { - $product = uc($product); - last; - } -} -my %release_dates = &setup_release_dates; +my $product = $ARGV[0]; +my %release_dates = &setup_release_dates($ARGV[1]); my $in_major_component_versions_section = 0; @@ -804,6 +797,7 @@ # sub setup_release_dates { my %release_dates; + my $file = shift; if (uc($product) eq 'LUCENE') { %release_dates = ( '0.01' => '2000-03-30', '0.04' => '2000-04-19', @@ -826,9 +820,7 @@ '3.0.0' => '2009-11-25'); } - print STDERR "Retrieving $project_info_url/$product ...\n"; - my $project_info_json = get_url_contents("$project_info_url/$product"); - + my $project_info_json = readFile($file); my $project_info = json2perl($project_info_json); for my $version (@{$project_info->{versions}}) { if ($version->{releaseDate}) { @@ -844,20 +836,13 @@ return %release_dates; } -# -# returns contents of the passed in url -# -sub get_url_contents { - my $url = shift; - my $tryWget = `wget --no-check-certificate -O - $url`; - if ($? eq 0) { - return $tryWget; - } - my $tryCurl = `curl $url`; - if ($? eq 0) { - return $tryCurl; - } - die "could not retrieve $url with either wget or curl!"; +sub readFile { + my $file = shift; + open(F, '<'.$file) || die "could not open $file: $!"; + local $/ = undef; + my $project_info_json = ; + close(F); + return $project_info_json; } # Index: solr/build.xml =================================================================== --- solr/build.xml (revision 1390348) +++ solr/build.xml (working copy) @@ -370,7 +370,8 @@ + changes.target.dir="${svn.export.dir}/solr/docs/changes" + changes.product="SOLR"/> - +