Mercurial > public > develkit

changeset 43:c1619b87800e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CM-127: Improve handling of differnt styles of NB projects jvmargs
author smith@nwoca.org
date Thu, 09 Jun 2011 08:48:36 -0400
parents f1144aa0c01b
children 714576165aba
files jacoco-ant.xml
diffstat 1 files changed, 12 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/jacoco-ant.xml	Tue Jun 07 21:44:14 2011 -0400
+++ b/jacoco-ant.xml	Thu Jun 09 08:48:36 2011 -0400
@@ -37,10 +37,18 @@
                   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"/>
+        <if><isset property="runmain.jvmargs"/>
+            <then>
+                <var name="runmain.jvmargs.jacoco" value="${runmain.jvmargs}"/>
+                <var name="runmain.jvmargs" value="${jacoco.coverage.agent} ${runmain.jvmargs.jacoco}"/>  
+            </then>
+        </if>
+        <if><isset property="run.jvmargs"/>
+            <then>
+                <var name="run.jvmargs.jacoco" value="${run.jvmargs}"/>
+                <var name="run.jvmargs" value="${jacoco.coverage.agent} ${run.jvmargs.jacoco}"/>  
+            </then>
+        </if>
     </target>
 
     <target name="coverage.xml"