From 3160f7e99ca174038414cae407be87895f903769 Mon Sep 17 00:00:00 2001
From: "Chris M. Hostetter" <hossman@apache.org>
Date: Fri, 15 Aug 2014 21:37:07 +0000
Subject: [PATCH] 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
---
 lucene/common-build.xml             |  2 ++
 lucene/site/changes/changes2html.pl | 11 ++++++++++-
 solr/CHANGES.txt                    |  4 ++++
 solr/build.xml                      |  8 +++++++-
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 7d2483ca054..d87f64700bc 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -2451,6 +2451,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
     <attribute name="changes.product"/>
     <attribute name="changes.src.file" default="CHANGES.txt"/>
     <attribute name="changes.target.dir" default="${changes.target.dir}"/>
+    <attribute name="lucene.javadoc.url" default="${lucene.javadoc.url}"/>
     <sequential>
       <mkdir dir="@{changes.target.dir}"/>
       <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.product}"/>
         <arg value="@{changes.target.dir}/jiraVersionList.json"/>
+        <arg value="@{lucene.javadoc.url}"/>
       </exec>
       <delete file="@{changes.target.dir}/jiraVersionList.json"/>
       <copy todir="@{changes.target.dir}">
diff --git a/lucene/site/changes/changes2html.pl b/lucene/site/changes/changes2html.pl
index dc3e2008aa2..fbe92f117ba 100755
--- a/lucene/site/changes/changes2html.pl
+++ b/lucene/site/changes/changes2html.pl
@@ -1,6 +1,6 @@
 #!/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
 #
@@ -44,8 +44,12 @@ my @releases = ();
 
 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 %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;
 
 
@@ -557,6 +561,11 @@ for my $rel (@releases) {
       # Link "[ github | gh ] pull request [ # ] X+" to Github pull request
       $item =~ s{((?:(?:(?:github|gh)\s+)?pull\s+request\s*(?:\#?\s*)?|gh-)(\d+))}
                 {<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') {
         # Find single Bugzilla issues
         $item =~ s~((?i:bug|patch|issue)\s*\#?\s*(\d+))
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index bae3f242f4f..7f70f3df8f6 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -20,6 +20,8 @@ See the tutorial at http://lucene.apache.org/solr/tutorial.html
 
 ==================  5.0.0 ==================
 
+Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
+
 Versions of Major Components
 ---------------------
 Apache Tika 1.5
@@ -101,6 +103,8 @@ Other Changes
 
 ==================  4.10.0 =================
 
+Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
+
 Versions of Major Components
 ---------------------
 Apache Tika 1.5
diff --git a/solr/build.xml b/solr/build.xml
index dd783e95a57..45dba5a644a 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -384,6 +384,9 @@
                    changes.product="SOLR"/>
 
     <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}"
                   prefix="${fullnamever}"
                   excludes="solr/example/**/*.sh solr/example/**/bin/ solr/scripts/**"/>
@@ -452,6 +455,9 @@
     <contrib-crawl target="add-lucene-libs-to-package"/>
  
     <tar destfile="${package.dir}/${fullnamever}.tgz" compression="gzip" longfile="gnu">
+      <tarfileset dir="../lucene"
+                  includes="CHANGES.txt"
+                  fullpath="${fullnamever}/LUCENE_CHANGES.txt" />
       <tarfileset dir="."
                   prefix="${fullnamever}"
                   includes="LICENSE.txt NOTICE.txt CHANGES.txt README.txt SYSTEM_REQUIREMENTS.txt
@@ -513,7 +519,7 @@
     <make-checksums file="${package.dir}/${fullnamever}.zip"/>
   </target>
 
-  <target name="changes-to-html">
+  <target name="changes-to-html" depends="define-lucene-javadoc-url">
     <build-changes changes.product="SOLR"/>
   </target>