lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rm...@apache.org
Subject svn commit: r1053236 - /lucene/dev/trunk/lucene/contrib/ant/build.xml
Date Tue, 28 Dec 2010 01:28:11 GMT
Author: rmuir
Date: Tue Dec 28 01:28:11 2010
New Revision: 1053236

URL: http://svn.apache.org/viewvc?rev=1053236&view=rev
Log:
remove trickiness, hopefully unbreak clover build

Modified:
    lucene/dev/trunk/lucene/contrib/ant/build.xml

Modified: lucene/dev/trunk/lucene/contrib/ant/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/ant/build.xml?rev=1053236&r1=1053235&r2=1053236&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/ant/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/ant/build.xml Tue Dec 28 01:28:11 2010
@@ -33,35 +33,18 @@
                refid="additional.dependencies"
   />
 
+  <property name="javac.includeAntRuntime" value="true"/>
+
   <import file="../contrib-build.xml"/>
 	
   <module-uptodate name="analysis/common" jarfile="${common.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"
       property="analyzers-common.uptodate" classpath.property="analyzers-common.jar"/>
 
-  <path id="common.classpath">
+  <path id="classpath">
 	 <pathelement path="${analyzers-common.jar}"/>
 	 <path refid="base.classpath"/>
   </path>
 
-  <!-- tricky: we compile against our supported version of ant (ant-path),
-       but because ant's junit task's includeantruntime *does not work at all*,
-       we hack up a custom test classpath that runs against the runtime ant.
-       this is the only way to avoid having two different versions of ant
-       in the classpath -->
-       
-  <path id="classpath">
-     <path refid="common.classpath"/>
-     <path refid="ant-path"/>
-  </path>
-
-  <path id="junit.classpath">
-    <path refid="common.classpath"/>
-    <pathelement location="${common.dir}/build/classes/test"/>
-    <path refid="junit-path"/>
-    <pathelement location="${build.dir}/classes/java"/>
-    <pathelement location="${build.dir}/classes/test"/>
-  </path>
-
   <target name="compile-core" depends="compile-analyzers-common, common.compile-core"
/>
 
   <target name="compile-analyzers-common" unless="analyzers-common.uptodate">



Mime
View raw message