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/27 04:22:20 UTC
svn commit: r1052992 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/build.xml lucene/common-build.xml lucene/contrib/ant/build.xml solr/
solr/common-build.xml
Author: rmuir
Date: Mon Dec 27 03:22:19 2010
New Revision: 1052992
URL: http://svn.apache.org/viewvc?rev=1052992&view=rev
Log:
when compiling, don't include whatever happens to be in ant's runtime in the classpath
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/build.xml
lucene/dev/branches/branch_3x/lucene/common-build.xml
lucene/dev/branches/branch_3x/lucene/contrib/ant/build.xml
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/common-build.xml
Modified: lucene/dev/branches/branch_3x/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/build.xml?rev=1052992&r1=1052991&r2=1052992&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/build.xml Mon Dec 27 03:22:19 2010
@@ -36,6 +36,7 @@
<path id="test.classpath">
<path refid="classpath"/>
<path refid="junit-path"/>
+ <path refid="ant-path"/>
<pathelement location="${build.dir}/classes/test"/>
</path>
@@ -72,6 +73,7 @@
<path id="backwards.test.compile.classpath">
<path refid="junit-path"/>
+ <path refid="ant-path"/>
<fileset dir="${backwards.dir}/lib">
<include name="lucene-core*.jar"/>
</fileset>
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=1052992&r1=1052991&r2=1052992&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/common-build.xml Mon Dec 27 03:22:19 2010
@@ -53,6 +53,10 @@
<pathelement location="${junit-location.jar}"/>
</path>
+ <path id="ant-path">
+ <fileset dir="${common.dir}/lib" includes="ant-*.jar"/>
+ </path>
+
<!-- default arguments to pass to JVM executing tests -->
<property name="testmethod" value=""/>
<property name="args" value=""/>
@@ -80,6 +84,9 @@
<property name="javac.target" value="1.5"/>
<property name="javac.source.backwards" value="1.5"/>
<property name="javac.target.backwards" value="1.5"/>
+ <!-- clover wants to run with -lib, otherwise we prefer a repeatable
+ classpath -->
+ <property name="javac.includeAntRuntime" value="${run.clover}"/>
<property name="javadoc.link" value="http://java.sun.com/j2se/1.5/docs/api/"/>
<property name="javadoc.access" value="protected"/>
@@ -647,6 +654,7 @@
<sequential>
<mkdir dir="@{destdir}"/>
<javac
+ includeAntRuntime="${javac.includeAntRuntime}"
encoding="${build.encoding}"
srcdir="@{srcdir}"
destdir="@{destdir}"
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=1052992&r1=1052991&r2=1052992&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/ant/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/ant/build.xml Mon Dec 27 03:22:19 2010
@@ -34,4 +34,29 @@
/>
<import file="../contrib-build.xml"/>
+
+ <path id="common.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>
Modified: lucene/dev/branches/branch_3x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/common-build.xml?rev=1052992&r1=1052991&r2=1052992&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/common-build.xml Mon Dec 27 03:22:19 2010
@@ -80,6 +80,10 @@
<!-- Java Version we are compatible with -->
<property name="java.compat.version" value="1.5" />
+ <!-- clover wants to run with -lib, otherwise we prefer a repeatable
+ classpath -->
+ <property name="javac.includeAntRuntime" value="${run.clover}"/>
+
<!-- Solr Implementation Version -->
<!--
This can be any string value that does not include spaces
@@ -261,6 +265,7 @@
source="${java.compat.version}"
debug="on"
encoding="utf8"
+ includeAntRuntime="${javac.includeAntRuntime}"
sourcepath=""
classpathref="@{classpathref}">
<nested />