You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2011/02/18 06:56:52 UTC

svn commit: r1071891 - in /lucene/dev/trunk/lucene: common-build.xml contrib/contrib-build.xml

Author: sarowe
Date: Fri Feb 18 05:56:52 2011
New Revision: 1071891

URL: http://svn.apache.org/viewvc?rev=1071891&view=rev
Log:
LUCENE-2926: contrib 'init' target now ensures that lucene-core jar is built and up-to-date

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

Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1071891&r1=1071890&r2=1071891&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Fri Feb 18 05:56:52 2011
@@ -664,6 +664,13 @@
     </typedef>
   </target>
 
+  <target name="lucene-uptodate" unless="lucene.uptodate">
+    <uptodate property="lucene.uptodate" 
+              targetfile="${common.dir}/build/lucene-core-${version}.jar">
+     	<srcfiles dir="${common.dir}/src/java" includes="**/*.java"/>
+    </uptodate>
+  </target>
+  
   <target name="rat-sources" depends="rat-sources-typedef"
 	  description="runs the tasks over source and test files">
     <rat:report xmlns:rat="antlib:org.apache.rat.anttasks">

Modified: lucene/dev/trunk/lucene/contrib/contrib-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/contrib-build.xml?rev=1071891&r1=1071890&r2=1071891&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/contrib-build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/contrib-build.xml Fri Feb 18 05:56:52 2011
@@ -60,7 +60,11 @@
     <property name="core.compiled" value="true"/>
   </target>
   
-  <target name="init" depends="common.init,build-lucene"/>
+  <target name="jar-lucene" depends="build-lucene" unless="lucene.uptodate">
+    <ant dir="${common.dir}" target="jar-core" inheritAll="false"/>
+  </target>
+  
+  <target name="init" depends="common.init,lucene-uptodate,jar-lucene"/>
   <target name="compile-test" depends="init" if="contrib.has.tests">
     <antcall target="common.compile-test" inheritRefs="true" />
   </target>