You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ivy-commits@incubator.apache.org by xa...@apache.org on 2007/10/17 21:14:52 UTC
svn commit: r585701 - /incubator/ivy/core/trunk/build.xml
Author: xavier
Date: Wed Oct 17 14:14:51 2007
New Revision: 585701
URL: http://svn.apache.org/viewvc?rev=585701&view=rev
Log:
review paths uses to fix a bug when using emma with unit tests
Modified:
incubator/ivy/core/trunk/build.xml
Modified: incubator/ivy/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/build.xml?rev=585701&r1=585700&r2=585701&view=diff
==============================================================================
--- incubator/ivy/core/trunk/build.xml (original)
+++ incubator/ivy/core/trunk/build.xml Wed Oct 17 14:14:51 2007
@@ -59,19 +59,37 @@
PREPARATION, CLEANING AND FLAGS TASKS
================================================================= -->
<target name="init">
- <path id="build.classpath">
+ <path id="lib.classpath">
<fileset dir="${lib.dir}">
<include name="*.jar" />
</fileset>
</path>
+ <path id="build.bootstrap.classpath">
+ <pathelement location="${core.classes.build.dir}" />
+ </path>
+ <path id="build.ant.classpath">
+ <pathelement location="${core.classes.build.dir}" />
+ <path refid="lib.classpath" />
+ </path>
+ <path id="build.optional.classpath">
+ <path refid="build.ant.classpath" />
+ </path>
<path id="run.classpath">
- <path refid="build.classpath" />
<pathelement location="${core.classes.build.dir}" />
<pathelement location="${ant.classes.build.dir}" />
<pathelement location="${optional.classes.build.dir}" />
+ <path refid="lib.classpath" />
</path>
<path id="test.classpath">
- <path refid="run.classpath" />
+ <pathelement location="${coverage.classes.dir}" />
+ <fileset dir="${lib.dir}">
+ <include name="*.jar" />
+ <exclude name="ant.jar" />
+ <exclude name="ant-*.jar" />
+ </fileset>
+ <pathelement location="${core.classes.build.dir}" />
+ <pathelement location="${ant.classes.build.dir}" />
+ <pathelement location="${optional.classes.build.dir}" />
<pathelement path="${test.build.dir}" />
</path>
</target>
@@ -193,13 +211,11 @@
<javac srcdir="${src.dir}"
destdir="${bootstrap.classes.build.dir}"
sourcepath=""
+ classpathref="build.bootstrap.classpath"
source="${ivy.minimum.javaversion}"
target="${ivy.minimum.javaversion}"
debug="${debug.mode}"
includeantruntime="yes">
- <classpath>
- <pathelement location="${core.classes.build.dir}" />
- </classpath>
<includesfile name="ant.patterns" />
</javac>
<copy todir="${bootstrap.classes.build.dir}" includeEmptyDirs="false">
@@ -215,16 +231,11 @@
<javac srcdir="${src.dir}"
destdir="${ant.classes.build.dir}"
sourcepath=""
+ classpathref="build.ant.classpath"
source="${ivy.minimum.javaversion}"
target="${ivy.minimum.javaversion}"
debug="${debug.mode}"
includeantruntime="no">
- <classpath>
- <pathelement location="${core.classes.build.dir}" />
- <fileset dir="${lib.dir}">
- <include name="**/*.jar"/>
- </fileset>
- </classpath>
<includesfile name="ant.patterns" />
</javac>
<copy todir="${ant.classes.build.dir}" includeEmptyDirs="false">
@@ -243,16 +254,11 @@
<javac srcdir="${src.dir}"
destdir="${optional.classes.build.dir}"
sourcepath=""
+ classpathref="build.optional.classpath"
source="${ivy.minimum.javaversion}"
target="${ivy.minimum.javaversion}"
debug="${debug.mode}"
includeantruntime="no">
- <classpath>
- <pathelement location="${core.classes.build.dir}" />
- <fileset dir="${lib.dir}">
- <include name="**/*.jar"/>
- </fileset>
- </classpath>
<includesfile name="optional.patterns" />
<includesfile name="ant.patterns" />
</javac>
@@ -422,16 +428,7 @@
includeantruntime="yes"
fork="true">
<classpath>
- <pathelement location="${coverage.classes.dir}" />
- <fileset dir="${lib.dir}">
- <include name="*.jar" />
- <exclude name="ant.jar" />
- <exclude name="ant-*.jar" />
- </fileset>
- <pathelement location="${core.classes.build.dir}" />
- <pathelement location="${ant.classes.build.dir}" />
- <pathelement location="${optional.classes.build.dir}" />
- <pathelement path="${test.build.dir}" />
+ <path refid="test.classpath" />
</classpath>
<jvmarg value="-Demma.coverage.out.file=${coverage.dir}/coverage.emma" />
<jvmarg value="-Demma.coverage.out.merge=true" />