You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2004/12/30 15:28:36 UTC
svn commit: r123718 - /cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml /cocoon/branches/BRANCH_2_1_X/tools/targets/samples-build.xml /cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml
Author: vgritsenko
Date: Thu Dec 30 06:28:35 2004
New Revision: 123718
URL: http://svn.apache.org/viewcvs?view=rev&rev=123718
Log:
add clover support
Modified:
cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml
cocoon/branches/BRANCH_2_1_X/tools/targets/samples-build.xml
cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml
Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml?view=diff&rev=123718&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml&r1=123717&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml&r2=123718
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml Thu Dec 30 06:28:35 2004
@@ -23,11 +23,10 @@
<!-- compiles everything -->
<target name="compile"
- depends="compile-core, compile-deprecated, compile-tests"/>
-
- <!-- compiles the core -->
- <target name="compile-core" depends="prepare">
+ depends="compile-core, compile-deprecated, compile-tests"/>
+ <!-- compiles mocks -->
+ <target name="compile-mocks" depends="prepare">
<!-- copy those files that need to be in the classpath -->
<copy todir="${build.dest}">
<fileset dir="${java}">
@@ -36,8 +35,6 @@
<exclude name="**/*.xconf"/>
</fileset>
</copy>
-
- <!-- compile mock classes -->
<mkdir dir="${build.mocks}"/>
<javac srcdir="${mocks}"
destdir="${build.mocks}"
@@ -49,8 +46,10 @@
nowarn="${compiler.nowarn}"
compiler="${compiler}"
classpathref="classpath"/>
+ </target>
- <!-- compile core source files -->
+ <!-- compiles the core -->
+ <target name="compile-core" depends="compile-mocks, clover.on">
<javac srcdir="${java}"
destdir="${build.dest}"
debug="${compiler.debug}"
@@ -59,12 +58,11 @@
target="${target.vm}"
source="${source.vm}"
nowarn="${compiler.nowarn}"
- compiler="${compiler}"
classpathref="classpath"/>
</target>
<!-- compiles deprecated code -->
- <target name="compile-deprecated" depends="prepare"
+ <target name="compile-deprecated" depends="prepare, clover.off"
unless="internal.exclude.deprecated">
<mkdir dir="${build.deprecated}"/>
@@ -83,7 +81,9 @@
classpathref="classpath"/>
</target>
- <target name="compile-tests" depends="compile-core, compile-deprecated">
+ <!-- compiles tests classes -->
+ <target name="compile-tests"
+ depends="compile-core, compile-deprecated, clover.off">
<mkdir dir="${build.test}"/>
<!-- Copy test files to build test dir -->
@@ -118,7 +118,7 @@
<!-- packages everything -->
<target name="package"
- depends="package-core, package-deprecated, package-testcase"/>
+ depends="package-core, package-deprecated, package-testcase"/>
<!-- package the core -->
<target name="package-core" depends="compile-core, block-roles">
Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/samples-build.xml
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/samples-build.xml?view=diff&rev=123718&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/samples-build.xml&r1=123717&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/samples-build.xml&r2=123718
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/samples-build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/samples-build.xml Thu Dec 30 06:28:35 2004
@@ -21,7 +21,8 @@
Samples Targets
</description>
- <target name="samples" depends="prepare" unless="internal.exclude.webapp.samples">
+ <target name="samples" depends="prepare, clover.off"
+ unless="internal.exclude.webapp.samples">
<mkdir dir="${build.samples}"/>
<javac srcdir="${samples}"
Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml?view=diff&rev=123718&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml&r1=123717&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml&r2=123718
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml Thu Dec 30 06:28:35 2004
@@ -169,4 +169,51 @@
inheritRefs="false"
target="prepare-anteater-tests"/>
</target>
+
+
+
+ <!--+
+ | Clover tasks
+ +-->
+ <target name="clover">
+ <available property="clover.present"
+ classname="com.cortexeb.tools.clover.tasks.CloverTask">
+ <classpath refid="classpath"/>
+ </available>
+ <!-- echo message="Clover present: ${clover.present}"/ -->
+ </target>
+
+ <target name="clover.init" depends="clover" if="clover.present">
+ <taskdef resource="clovertasks"/>
+ </target>
+
+ <target name="clover.on" depends="clover.init" if="clover.present">
+ <!-- echo message="Clover is ON!"/ -->
+ <echo message="Clover is present? ${clover.present}"/>
+ <clover-setup initString="${build}/clover/coverage.db"
+ tmpdir="${build}/clover/src"
+ preserve="false"
+ enabled="true"/>
+ </target>
+
+ <target name="clover.off" depends="clover.init" if="clover.present">
+ <!-- echo message="Clover is OFF!"/ -->
+ <clover-setup enabled="false"/>
+ </target>
+
+ <target name="clover.historypoint" depends="clover.init" if="clover.present">
+ <clover-historypoint historyDir="${build}/clover/history"/>
+ </target>
+
+ <target name="clover.report" depends="init, clover.on" if="clover.present">
+ <clover-report>
+ <current outfile="${build}/clover-report">
+ <format type="html"/>
+ </current>
+ <historical outfile="${build}/clover-history"
+ historyDir="${build}/clover/history">
+ <format type="html"/>
+ </historical>
+ </clover-report>
+ </target>
</project>