svn commit: r1198012 - in /lucene/dev/branches/branch_3x: ./ lucene/ lucene/common-build.xml

[us...@apache.org]

Author: uschindler
Date: Sat Nov  5 18:52:02 2011
New Revision: 1198012

URL: http://svn.apache.org/viewvc?rev=1198012&view=rev
Log:
Merged revision(s) 1198009 from lucene/dev/trunk:
LUCENE-3490: Fix inconsistency in build of test-framework. Clover was no longer able to find source files

Modified:
    lucene/dev/branches/branch_3x/   (props changed)
    lucene/dev/branches/branch_3x/lucene/   (props changed)
    lucene/dev/branches/branch_3x/lucene/common-build.xml

Modified: lucene/dev/branches/branch_3x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/common-build.xml?rev=1198012&r1=1198011&r2=1198012&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/common-build.xml Sat Nov  5 18:52:02 2011
@@ -128,7 +128,7 @@
 
   <property name="src.dir" location="src/java"/>
   <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"/>
   <!-- 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"/>
@@ -317,7 +317,7 @@
     <!-- Copy the resources folder (if existent) -->
     <copy todir="${build.dir}/classes/java" includeEmptyDirs="false">
       <globmapper from="resources/*" to="*" handledirsep="yes"/>
-      <fileset dir="src" includes="resources/**"/>
+      <fileset dir="${src.dir}/.." includes="resources/**"/>
     </copy>
   </target>
 
@@ -469,8 +469,13 @@
   </path>
   
   <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"/>
+            <!-- Copy the resources folder (if existent) -->
+        <copy todir="${build.dir}/classes/test-framework" includeEmptyDirs="false">
+          <globmapper from="resources/*" to="*" handledirsep="yes"/>
+          <fileset dir="${tests-framework.src.dir}/.." includes="resources/**"/>
+       </copy>
   </target>
 
   <target name="compile-tools">