lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r1151784 - in /lucene/dev/branches/branch_3x: ./ lucene/ lucene/backwards/ lucene/backwards/src/test-framework/ lucene/backwards/src/test/ lucene/build.xml lucene/common-build.xml solr/
Date Thu, 28 Jul 2011 10:23:24 GMT
Author: uschindler
Date: Thu Jul 28 10:23:23 2011
New Revision: 1151784

URL: http://svn.apache.org/viewvc?rev=1151784&view=rev
Log:
Fix building test-frameworks from contribs: 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.

Modified:
    lucene/dev/branches/branch_3x/   (props changed)
    lucene/dev/branches/branch_3x/lucene/   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/src/test/   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/src/test-framework/   (props changed)
    lucene/dev/branches/branch_3x/lucene/build.xml
    lucene/dev/branches/branch_3x/lucene/common-build.xml
    lucene/dev/branches/branch_3x/solr/   (props changed)

Modified: lucene/dev/branches/branch_3x/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/build.xml?rev=1151784&r1=1151783&r2=1151784&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/build.xml Thu Jul 28 10:23:23 2011
@@ -37,7 +37,6 @@
   <path id="test.classpath">
   	<path refid="classpath"/>
     <path refid="junit-path"/>
-    <path refid="ant-path"/>
     <pathelement location="${build.dir}/classes/test-framework"/>
     <pathelement location="${build.dir}/classes/test"/>
   </path>

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=1151784&r1=1151783&r2=1151784&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/common-build.xml Thu Jul 28 10:23:23 2011
@@ -452,10 +452,15 @@
     </ant>
     <property name="core.compiled" value="true"/>
   </target>
-
+  
+  <path id="test-framework.classpath">
+    <path refid="ant-path"/>
+    <path refid="test.classpath"/>
+  </path>
+  
   <target name="compile-test-framework" depends="compile-core">
   	<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 name="compile-tools">



Mime
View raw message