svn commit: r1390436 - in /lucene/dev/trunk: lucene/build.xml lucene/common-build.xml solr/build.xml

[us...@apache.org]

Author: uschindler
Date: Wed Sep 26 12:35:25 2012
New Revision: 1390436

URL: http://svn.apache.org/viewvc?rev=1390436&view=rev
Log:
LUCENE-4436: When building source distribution, changes-to-html uses wrong script and wrong CHANGES.txt

Modified:
    lucene/dev/trunk/lucene/build.xml
    lucene/dev/trunk/lucene/common-build.xml
    lucene/dev/trunk/solr/build.xml

Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=1390436&r1=1390435&r2=1390436&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Wed Sep 26 12:35:25 2012
@@ -415,8 +415,9 @@
     <!-- Exclude clover license files incompatible with the ASL -->
     <delete dir="${svn.export.dir}/tools/clover"/>
 
-    <build-changes changes.src.dir="${svn.export.dir}/site/changes"
-                   changes.target.dir="${svn.export.dir}/docs/changes" changes.product="LUCENE"/>
+    <build-changes changes.src.file="${svn.export.dir}/CHANGES.txt"
+                   changes.target.dir="${svn.export.dir}/docs/changes"
+                   changes.product="LUCENE"/>
     <tar tarfile="${source.package.file}" compression="gzip" longfile="gnu">
       <tarfileset prefix="lucene-${version}" dir="${svn.export.dir}"/>
     </tar>
@@ -507,7 +508,7 @@
   </target>
 
   <target name="changes-to-html">
-    <build-changes changes.src.dir="${changes.src.dir}" changes.target.dir="${changes.target.dir}" changes.product="LUCENE"/>
+    <build-changes changes.product="LUCENE"/>
   </target>
 
   <target name="pitest-modules" depends="compile-test">

Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1390436&r1=1390435&r2=1390436&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Wed Sep 26 12:35:25 2012
@@ -1892,22 +1892,22 @@ ${tests-output}/junit4-*.suites     - pe
    -->
   <macrodef name="build-changes">
     <attribute name="changes.product"/>
-    <attribute name="changes.src.dir" default="${changes.src.dir}"/>
+    <attribute name="changes.src.file" default="CHANGES.txt"/>
     <attribute name="changes.target.dir" default="${changes.target.dir}"/>
     <sequential>
       <mkdir dir="@{changes.target.dir}"/>
       <get src="https://issues.apache.org/jira/rest/api/2/project/@{changes.product}"
         dest="@{changes.target.dir}/jiraVersionList.json" httpusecaches="false"/>
-      <exec executable="${perl.exe}" input="CHANGES.txt" output="@{changes.target.dir}/Changes.html"
+      <exec executable="${perl.exe}" input="@{changes.src.file}" output="@{changes.target.dir}/Changes.html"
             failonerror="true" logError="true">
         <arg value="-CSD"/>
-        <arg value="@{changes.src.dir}/changes2html.pl"/>
+        <arg value="${changes.src.dir}/changes2html.pl"/>
         <arg value="@{changes.product}"/>
         <arg value="@{changes.target.dir}/jiraVersionList.json"/>
       </exec>
       <delete file="@{changes.target.dir}/jiraVersionList.json"/>
       <copy todir="@{changes.target.dir}">
-        <fileset dir="@{changes.src.dir}" includes="*.css"/>
+        <fileset dir="${changes.src.dir}" includes="*.css"/>
       </copy>
     </sequential>
   </macrodef>

Modified: lucene/dev/trunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=1390436&r1=1390435&r2=1390436&view=diff
==============================================================================
--- lucene/dev/trunk/solr/build.xml (original)
+++ lucene/dev/trunk/solr/build.xml Wed Sep 26 12:35:25 2012
@@ -369,7 +369,7 @@
     <!-- Exclude clover license files incompatible with the ASL -->
     <delete dir="${svn.export.dir}/lucene/tools/clover"/>
 
-    <build-changes changes.src.dir="${svn.export.dir}/lucene/site/changes"
+    <build-changes changes.src.file="${svn.export.dir}/solr/CHANGES.txt"
                    changes.target.dir="${svn.export.dir}/solr/docs/changes"
                    changes.product="SOLR"/>
 
@@ -499,7 +499,7 @@
   </target>
 
   <target name="changes-to-html">
-    <build-changes changes.src.dir="${changes.src.dir}" changes.target.dir="${changes.target.dir}" changes.product="SOLR"/>
+    <build-changes changes.product="SOLR"/>
   </target>
  
   <target name="sign-artifacts">