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

LUCENE-3490: Fix inconsistency in build of test-framework. Clover was no longer able to find source files 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1198009 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2011-11-05 18:47:39 +00:00
parent 69be4f84c7
commit b03675131a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lucene/common-build.xml
View File

@ -129,7 +129,7 @@
<property name="src.dir" location="src/java"/> <property name="src.dir" location="src/java"/>
<property name="tests.src.dir" location="src/test"/> <property name="tests.src.dir" location="src/test"/>
<property name="tests-framework.src.dir" location="${common.dir}/src/test-framework"/> <property name="tests-framework.src.dir" location="${common.dir}/src/test-framework/java"/>
<property name="build.dir" location="build"/> <property name="build.dir" location="build"/>
<!-- Needed in case a contrib needs the original build, also for compile-tools to be called from contrib --> <!-- Needed in case a contrib needs the original build, also for compile-tools to be called from contrib -->
<property name="common.build.dir" location="${common.dir}/build"/> <property name="common.build.dir" location="${common.dir}/build"/>
@ -323,7 +323,7 @@
<!-- Copy the resources folder (if existent) --> <!-- Copy the resources folder (if existent) -->
<copy todir="${build.dir}/classes/java" includeEmptyDirs="false"> <copy todir="${build.dir}/classes/java" includeEmptyDirs="false">
<globmapper from="resources/*" to="*" handledirsep="yes"/> <globmapper from="resources/*" to="*" handledirsep="yes"/>
<fileset dir="src" includes="resources/**"/> <fileset dir="${src.dir}/.." includes="resources/**"/>
</copy> </copy>
</target> </target>
@ -472,12 +472,12 @@
</path> </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}/java" 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-framework.classpath"/> test.classpath="test-framework.classpath"/>
<!-- Copy the resources folder (if existent) --> <!-- Copy the resources folder (if existent) -->
<copy todir="${build.dir}/classes/test-framework" includeEmptyDirs="false"> <copy todir="${build.dir}/classes/test-framework" includeEmptyDirs="false">
<globmapper from="resources/*" to="*" handledirsep="yes"/> <globmapper from="resources/*" to="*" handledirsep="yes"/>
<fileset dir="${tests-framework.src.dir}" includes="resources/**"/> <fileset dir="${tests-framework.src.dir}/.." includes="resources/**"/>
</copy> </copy>
</target> </target>