Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix building test-frameworks from contribs/modules: The classpath used during compilation did not include ANT when executed from modules or contribs, so the build failed. Now the test-framework gets its own compilation classpath, the ant.jar can even be removed completely from top-level. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1151782 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2011-07-28 10:17:36 +00:00
parent 23d22e4d47
commit 7221c4cee5
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lucene/build.xml
View File

@ -32,7 +32,6 @@
<path id="test.classpath"> <path id="test.classpath">
<path refid="classpath"/> <path refid="classpath"/>
<path refid="junit-path"/> <path refid="junit-path"/>
<path refid="ant-path"/>
<pathelement location="${build.dir}/classes/test-framework"/> <pathelement location="${build.dir}/classes/test-framework"/>
<pathelement location="${build.dir}/classes/test"/> <pathelement location="${build.dir}/classes/test"/>
</path> </path>

7
lucene/common-build.xml
View File

@ -460,9 +460,14 @@
<property name="core.compiled" value="true"/> <property name="core.compiled" value="true"/>
</target> </target>
<path id="test-framework.classpath">
<path refid="ant-path"/>
<path refid="test.classpath"/>
</path>
<target name="compile-test-framework" depends="compile-core"> <target name="compile-test-framework" depends="compile-core">
<compile-test-macro srcdir="${tests-framework.src.dir}" destdir="${common.dir}/build/classes/test-framework" <compile-test-macro srcdir="${tests-framework.src.dir}" destdir="${common.dir}/build/classes/test-framework"
test.classpath="test.classpath"/> test.classpath="test-framework.classpath"/>
</target> </target>
<target name="compile-tools"> <target name="compile-tools">