SOLR-6342: build.xml clones lucene/CHANGES.txt as LUCENE_CHANGES.txt in solr releases; changes2html hotlinks LUCENE_CHANGES.txt when found

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1618281 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris M. Hostetter 2014-08-15 21:37:07 +00:00
parent 0229a057a4
commit 3160f7e99c
4 changed files with 23 additions and 2 deletions

View File

@ -2451,6 +2451,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
<attribute name="changes.product"/> <attribute name="changes.product"/>
<attribute name="changes.src.file" default="CHANGES.txt"/> <attribute name="changes.src.file" default="CHANGES.txt"/>
<attribute name="changes.target.dir" default="${changes.target.dir}"/> <attribute name="changes.target.dir" default="${changes.target.dir}"/>
<attribute name="lucene.javadoc.url" default="${lucene.javadoc.url}"/>
<sequential> <sequential>
<mkdir dir="@{changes.target.dir}"/> <mkdir dir="@{changes.target.dir}"/>
<get src="https://issues.apache.org/jira/rest/api/2/project/@{changes.product}" <get src="https://issues.apache.org/jira/rest/api/2/project/@{changes.product}"
@ -2461,6 +2462,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
<arg value="${changes.src.dir}/changes2html.pl"/> <arg value="${changes.src.dir}/changes2html.pl"/>
<arg value="@{changes.product}"/> <arg value="@{changes.product}"/>
<arg value="@{changes.target.dir}/jiraVersionList.json"/> <arg value="@{changes.target.dir}/jiraVersionList.json"/>
<arg value="@{lucene.javadoc.url}"/>
</exec> </exec>
<delete file="@{changes.target.dir}/jiraVersionList.json"/> <delete file="@{changes.target.dir}/jiraVersionList.json"/>
<copy todir="@{changes.target.dir}"> <copy todir="@{changes.target.dir}">

View File

@ -1,6 +1,6 @@
#!/usr/bin/perl #!/usr/bin/perl
# #
# Transforms Lucene Java's CHANGES.txt into Changes.html # Transforms Lucene Core's or Solr's CHANGES.txt into Changes.html
# #
# Input is on STDIN, output is to STDOUT # Input is on STDIN, output is to STDOUT
# #
@ -44,8 +44,12 @@ my @releases = ();
my @lines = <STDIN>; # Get all input at once my @lines = <STDIN>; # Get all input at once
#
# Cmdline args: <LUCENE|SOLR> <JIRA-release-dates-json> <lucene-javadoc-url>(only from Solr)
#
my $product = $ARGV[0]; my $product = $ARGV[0];
my %release_dates = &setup_release_dates($ARGV[1]); my %release_dates = &setup_release_dates($ARGV[1]);
my $lucene_javadoc_url = ($product eq 'SOLR' ? $ARGV[2] : ''); # Only Solr supplies this on the cmdline
my $in_major_component_versions_section = 0; my $in_major_component_versions_section = 0;
@ -557,6 +561,11 @@ for my $rel (@releases) {
# Link "[ github | gh ] pull request [ # ] X+" to Github pull request # Link "[ github | gh ] pull request [ # ] X+" to Github pull request
$item =~ s{((?:(?:(?:github|gh)\s+)?pull\s+request\s*(?:\#?\s*)?|gh-)(\d+))} $item =~ s{((?:(?:(?:github|gh)\s+)?pull\s+request\s*(?:\#?\s*)?|gh-)(\d+))}
{<a href="${github_pull_request_prefix}$2">$1</a>}gi; {<a href="${github_pull_request_prefix}$2">$1</a>}gi;
# Link "LUCENE_CHANGES.txt" to Lucene's same-release Changes.html
if ($product eq 'SOLR') {
$item =~ s[(LUCENE_CHANGES.txt)]
[<a href="${lucene_javadoc_url}changes/Changes.html">$1</a>]g;
}
if ($product eq 'LUCENE') { if ($product eq 'LUCENE') {
# Find single Bugzilla issues # Find single Bugzilla issues
$item =~ s~((?i:bug|patch|issue)\s*\#?\s*(\d+)) $item =~ s~((?i:bug|patch|issue)\s*\#?\s*(\d+))

View File

@ -20,6 +20,8 @@ See the tutorial at http://lucene.apache.org/solr/tutorial.html
================== 5.0.0 ================== ================== 5.0.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
Versions of Major Components Versions of Major Components
--------------------- ---------------------
Apache Tika 1.5 Apache Tika 1.5
@ -101,6 +103,8 @@ Other Changes
================== 4.10.0 ================= ================== 4.10.0 =================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
Versions of Major Components Versions of Major Components
--------------------- ---------------------
Apache Tika 1.5 Apache Tika 1.5

View File

@ -384,6 +384,9 @@
changes.product="SOLR"/> changes.product="SOLR"/>
<tar destfile="${source.package.file}" compression="gzip" longfile="gnu"> <tar destfile="${source.package.file}" compression="gzip" longfile="gnu">
<tarfileset dir="${svn.export.dir}/lucene"
includes="CHANGES.txt"
fullpath="${fullnamever}/solr/LUCENE_CHANGES.txt" />
<tarfileset dir="${svn.export.dir}" <tarfileset dir="${svn.export.dir}"
prefix="${fullnamever}" prefix="${fullnamever}"
excludes="solr/example/**/*.sh solr/example/**/bin/ solr/scripts/**"/> excludes="solr/example/**/*.sh solr/example/**/bin/ solr/scripts/**"/>
@ -452,6 +455,9 @@
<contrib-crawl target="add-lucene-libs-to-package"/> <contrib-crawl target="add-lucene-libs-to-package"/>
<tar destfile="${package.dir}/${fullnamever}.tgz" compression="gzip" longfile="gnu"> <tar destfile="${package.dir}/${fullnamever}.tgz" compression="gzip" longfile="gnu">
<tarfileset dir="../lucene"
includes="CHANGES.txt"
fullpath="${fullnamever}/LUCENE_CHANGES.txt" />
<tarfileset dir="." <tarfileset dir="."
prefix="${fullnamever}" prefix="${fullnamever}"
includes="LICENSE.txt NOTICE.txt CHANGES.txt README.txt SYSTEM_REQUIREMENTS.txt includes="LICENSE.txt NOTICE.txt CHANGES.txt README.txt SYSTEM_REQUIREMENTS.txt
@ -513,7 +519,7 @@
<make-checksums file="${package.dir}/${fullnamever}.zip"/> <make-checksums file="${package.dir}/${fullnamever}.zip"/>
</target> </target>
<target name="changes-to-html"> <target name="changes-to-html" depends="define-lucene-javadoc-url">
<build-changes changes.product="SOLR"/> <build-changes changes.product="SOLR"/>
</target> </target>