Author: maartenc
Date: Tue May 8 15:17:58 2007
New Revision: 536351
URL: http://svn.apache.org/viewvc?view=rev&rev=536351
Log:
FIX: build fails without emma code coverage JARs present (IVY-478)
Modified:
incubator/ivy/core/trunk/CHANGES.txt
incubator/ivy/core/trunk/build.xml
Modified: incubator/ivy/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/CHANGES.txt?view=diff&rev=536351&r1=536350&r2=536351
==============================================================================
--- incubator/ivy/core/trunk/CHANGES.txt (original)
+++ incubator/ivy/core/trunk/CHANGES.txt Tue May 8 15:17:58 2007
@@ -54,6 +54,7 @@
- FIX: ivy:install ant task does not fail on error (IVY-475) (thanks to
Jeffrey Blatttman)
- FIX: Credentials are shown in build log even if debug is not enabled
(IVY-486) (thanks to Gilles Scokart)
- FIX: Post-Resolve task shouldn't set the 'resolveid' (IVY-489)
+- FIX: build fails without emma code coverage JARs present (IVY-478)
2.0.0-alpha1-incubating
=====================================
Modified: incubator/ivy/core/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/build.xml?view=diff&rev=536351&r1=536350&r2=536351
==============================================================================
--- incubator/ivy/core/trunk/build.xml (original)
+++ incubator/ivy/core/trunk/build.xml Tue May 8 15:17:58 2007
@@ -322,9 +322,12 @@
<taskdef resource="emma_ant.properties"
classpathref="emma.classpath" />
<property name="emma.enabled" value="true" />
<property name="coverage.dir" value="${build.dir}/coverage" />
+ <property name="coverage.classes.dir"
value="${coverage.dir}/classes" />
<mkdir dir="${coverage.dir}" />
+ <mkdir dir="${coverage.classes.dir}" />
<emma enabled="${emma.enabled}" >
- <instr mode="overwrite"
+ <instr mode="copy"
+ destdir="${coverage.dir}/classes"
metadatafile="${coverage.dir}/metadata.emma">
<instrpath>
<pathelement
location="${core.classes.build.dir}"/>
@@ -367,6 +370,7 @@
printsummary="yes"
fork="true">
<classpath>
+ <pathelement location="${coverage.classes.dir}" />
<path refid="test.classpath"/>
</classpath>
<jvmarg
value="-Demma.coverage.out.file=${coverage.dir}/coverage.emma" />
