# HG changeset patch # User smith@nwoca.org # Date 1307484527 14400 # Node ID 139a3611ae993dbac6a4da1e286d0eb02fe37f8e # Parent 5f8d6291cc6636a7a4dcc821c2df75ae69c917ed CM-127: Move castor-ant to develkit and teach jacoco how to instrument non-groovy projects. diff -r 5f8d6291cc66 -r 139a3611ae99 castor-ant.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/castor-ant.xml Tue Jun 07 18:08:47 2011 -0400 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="castor-ant" default="all" basedir="." + xmlns:ivy="antlib:fr.jayasoft.ivy.ant" > + + <!-- Standard Castor initializer. + Should used by all Ivy-based projects using Castor 1.2 or higher. + Project's ivy.xml must provide a configuration called 'castor-ant' + to declare the desired version of castor. + --> + <target name="castor-init" unless="castor.initialized"> + <property name="castor.initialized" value="true"/> + <ivy:settings id="castor.ivy.id"/> + <ivy:resolve id="castor.ivy.id" conf="castor-ant" log="quiet"/> + <ivy:cachepath + resolveId="castor.ivy.id" + pathid="castor.codegen.classpath" + conf="castor-ant" + type="jar" + log="quiet"/> + <taskdef name="castor-srcgen" + classname="org.castor.anttask.CastorCodeGenTask" + classpathref="castor.codegen.classpath" /> + + </target> +</project> diff -r 5f8d6291cc66 -r 139a3611ae99 jacoco-ant.xml --- a/jacoco-ant.xml Tue Jun 07 15:12:29 2011 -0400 +++ b/jacoco-ant.xml Tue Jun 07 18:08:47 2011 -0400 @@ -37,6 +37,10 @@ resource="org/jacoco/ant/antlib.xml"/> <jacoco:agent property="jacoco.coverage.agent" destfile="${jacoco.data.file}"/> + <var name="runmain.jvmargs.jacoco" value="${runmain.jvmargs}"/> + <var name="runmain.jvmargs" value="${jacoco.coverage.agent} ${runmain.jvmargs.jacoco}"/> + <echoproperties prefix="jacoco"/> + <echoproperties prefix="runmain"/> </target> <target name="coverage.xml"