Mercurial > public > develkit
changeset 67:9dcb429eea14
USPSR-346: clean up groovy script and allow jacoco to be disabled.
| author | smith@nwoca.org |
|---|---|
| date | Fri, 14 Oct 2011 14:32:50 -0400 |
| parents | a85308f02ef4 |
| children | bd192b070501 |
| files | groovy-ant.xml jacoco-ant.xml |
| diffstat | 2 files changed, 1 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- 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>
--- 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"/>