You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by gs...@apache.org on 2011/03/25 16:36:59 UTC

svn commit: r1085429 - in /lucene/dev/branches/lucene_solr_3_1: ./ lucene/ lucene/build.xml lucene/contrib/lucli/build.xml solr/ solr/build.xml

Author: gsingers
Date: Fri Mar 25 15:36:58 2011
New Revision: 1085429

URL: http://svn.apache.org/viewvc?rev=1085429&view=rev
Log:
LUCENE-2992: backport to 3.1

Modified:
    lucene/dev/branches/lucene_solr_3_1/   (props changed)
    lucene/dev/branches/lucene_solr_3_1/lucene/   (props changed)
    lucene/dev/branches/lucene_solr_3_1/lucene/build.xml
    lucene/dev/branches/lucene_solr_3_1/lucene/contrib/lucli/build.xml   (props changed)
    lucene/dev/branches/lucene_solr_3_1/solr/   (props changed)
    lucene/dev/branches/lucene_solr_3_1/solr/build.xml   (props changed)

Modified: lucene/dev/branches/lucene_solr_3_1/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/lucene/build.xml?rev=1085429&r1=1085428&r2=1085429&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/lucene/build.xml (original)
+++ lucene/dev/branches/lucene_solr_3_1/lucene/build.xml Fri Mar 25 15:36:58 2011
@@ -376,6 +376,7 @@
     <exec dir="." executable="svn" failonerror="true">
       <arg line="export --native-eol LF -r ${svn.Revision} ${svn.URL} ${svn.export.dir}"/>
     </exec>
+    <build-changes changes.src.dir="${svn.export.dir}/src/site/changes" changes.target.dir="${svn.export.dir}/docs/changes"/>
   </target>
 
   <!-- ================================================================== -->
@@ -652,18 +653,26 @@
   <!--
    compile changes.txt into an html file
    -->
+  <macrodef name="build-changes">
+    <attribute name="changes.src.dir" default="${changes.src.dir}"/>
+    <attribute name="changes.target.dir" default="${changes.target.dir}"/>
+    <sequential>
+      <mkdir dir="@{changes.target.dir}"/>
+      <exec executable="perl" input="CHANGES.txt" output="@{changes.target.dir}/Changes.html" failonerror="true">
+        <arg value="@{changes.src.dir}/changes2html.pl"/>
+      </exec>
+      <exec executable="perl" input="contrib/CHANGES.txt" output="@{changes.target.dir}/Contrib-Changes.html"
+            failonerror="true">
+        <arg value="@{changes.src.dir}/changes2html.pl"/>
+      </exec>
+      <copy todir="@{changes.target.dir}">
+        <fileset dir="@{changes.src.dir}" includes="*.css"/>
+      </copy>
+    </sequential>
+  </macrodef>
 
   <target name="changes-to-html">
-    <mkdir dir="${changes.target.dir}"/>
-    <exec executable="perl" input="CHANGES.txt" output="${changes.target.dir}/Changes.html" failonerror="true">
-      <arg value="${changes.src.dir}/changes2html.pl"/>
-    </exec>
-    <exec executable="perl" input="contrib/CHANGES.txt" output="${changes.target.dir}/Contrib-Changes.html" failonerror="true">
-      <arg value="${changes.src.dir}/changes2html.pl"/>
-    </exec>
-    <copy todir="${changes.target.dir}">
-      <fileset dir="${changes.src.dir}" includes="*.css"/>
-    </copy>
+    <build-changes changes.src.dir="${changes.src.dir}" changes.target.dir="${changes.target.dir}" />
   </target>
 
   <!--