changeset 41:139a3611ae99

CM-127: Move castor-ant to develkit and teach jacoco how to instrument non-groovy projects.
author smith@nwoca.org
date Tue, 07 Jun 2011 18:08:47 -0400
parents 5f8d6291cc66
children f1144aa0c01b
files castor-ant.xml jacoco-ant.xml
diffstat 2 files changed, 29 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /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>
--- 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"