You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2010/12/28 02:30:09 UTC
svn commit: r1053237 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/contrib/ant/build.xml solr/
Author: rmuir
Date: Tue Dec 28 01:30:09 2010
New Revision: 1053237
URL: http://svn.apache.org/viewvc?rev=1053237&view=rev
Log:
remove trickiness, hopefully unbreak clover build
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/ant/build.xml
lucene/dev/branches/branch_3x/solr/ (props changed)
Modified: lucene/dev/branches/branch_3x/lucene/contrib/ant/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/ant/build.xml?rev=1053237&r1=1053236&r2=1053237&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/ant/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/ant/build.xml Tue Dec 28 01:30:09 2010
@@ -33,30 +33,13 @@
refid="additional.dependencies"
/>
+ <property name="javac.includeAntRuntime" value="true"/>
+
<import file="../contrib-build.xml"/>
- <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>
-
</project>