# HG changeset patch
# User smith@nwoca.org
# Date 1318617170 14400
# Node ID 9dcb429eea1428a585e4b3d28a9b8adbd46d91cc
# Parent  a85308f02ef455c8816bc971ee10d97df0cc410b
USPSR-346: clean up groovy script and allow jacoco to be disabled.

diff -r a85308f02ef4 -r 9dcb429eea14 groovy-ant.xml
--- a/groovy-ant.xml	Fri Oct 14 08:35:40 2011 -0400
+++ b/groovy-ant.xml	Fri Oct 14 14:32:50 2011 -0400
@@ -19,7 +19,6 @@
     <ssdtant:replace-target target="-init-macrodef-javac" with="-groovy-init-macrodef-javac-groovyc"/>
 
     <target depends="init" name="groovydoc">
-        <echoproperties prefix="ivy"/>
         <taskdef name="groovydoc"
                  classname="org.codehaus.groovy.ant.Groovydoc"
                  classpath="${run.classpath}"/>
@@ -158,20 +157,6 @@
                     </javac>
                 </groovyc>
                          
-<!--                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
-                    <src>
-                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
-                            <include name="*"/>
-                        </dirset>
-                    </src>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <compilerarg line="${javac.compilerargs}"/>
-                    <customize/>
-                </javac>
--->
             </sequential>
         </macrodef>
         
diff -r a85308f02ef4 -r 9dcb429eea14 jacoco-ant.xml
--- a/jacoco-ant.xml	Fri Oct 14 08:35:40 2011 -0400
+++ b/jacoco-ant.xml	Fri Oct 14 14:32:50 2011 -0400
@@ -27,7 +27,7 @@
 
     </target>
 
-    <target name="with.coverage" depends="-check.jacoco" if="jacoco.installed">
+    <target name="with.coverage" depends="-check.jacoco" if="jacoco.installed" unless="jacoco.disabled">
         <property name="coverage.run.with.jacoco" value="true"/>
         <mkdir dir="${jacoco.dir}"/>
         <copy file="${jacoco.agent.jar.file}" tofile="${jacoco.dir}/jacocoagent.jar"/>