[jboss-svn-commits] JBL Code SVN: r32881 - labs/jbosstm/trunk/XTS.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri May 14 04:03:07 EDT 2010
Author: adinn
Date: 2010-05-14 04:03:07 -0400 (Fri, 14 May 2010)
New Revision: 32881
Added:
labs/jbosstm/trunk/XTS/report.xml
Modified:
labs/jbosstm/trunk/XTS/build.xml
labs/jbosstm/trunk/XTS/sharedbuild.xml
Log:
added script to build emma coverage report and modified build scripts to locate metadata and report output in a separate XTS/emma-report directory -- fixes JBTM-682
Modified: labs/jbosstm/trunk/XTS/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/build.xml 2010-05-14 07:50:36 UTC (rev 32880)
+++ labs/jbosstm/trunk/XTS/build.xml 2010-05-14 08:03:07 UTC (rev 32881)
@@ -57,8 +57,13 @@
<mkdir dir="${xts.installationdirectory}"/>
</target>
+ <target name="init.emma.report.dir" if="@{includeemma}">
+ <mkdir dir="${emma.report.dir}"/>
+ </target>
+
<!-- Project targets - must add all module names to each target -->
- <target name="build-projects" depends="init, init.install.dir, wsas.build,
+ <target name="build-projects" depends="init, init.install.dir,
+ init.emma.report.dir, wsas.build,
ws-c.build, wscf.build,
ws-t.build, wstx.build,
recovery.build, htdocs">
Added: labs/jbosstm/trunk/XTS/report.xml
===================================================================
--- labs/jbosstm/trunk/XTS/report.xml (rev 0)
+++ labs/jbosstm/trunk/XTS/report.xml 2010-05-14 08:03:07 UTC (rev 32881)
@@ -0,0 +1,89 @@
+<project default="report">
+ <property name="root.dir" location=".."/>
+
+ <property name="xts.dir" location="${root.dir}/XTS"/>
+
+ <property name="wsas.src.dir" location="${xts.dir}/WSAS/classes"/>
+ <property name="wscf.src.dir" location="${xts.dir}/WSCF/classes"/>
+ <property name="wscf11.src.dir" location="${xts.dir}/WSCF/classes11"/>
+ <property name="wscf10.src.dir" location="${xts.dir}/WSCF/classes10"/>
+ <property name="ws-c.src.dir" location="${xts.dir}/WS-C/dev/src"/>
+ <property name="ws-c11.src.dir" location="${xts.dir}/WS-C/dev/src11"/>
+ <property name="ws-c10.src.dir" location="${xts.dir}/WS-C/dev/src10"/>
+ <property name="ws-t.src.dir" location="${xts.dir}/WS-T/dev/src"/>
+ <property name="ws-t11.src.dir" location="${xts.dir}/WS-T/dev/src11"/>
+ <property name="ws-t10.src.dir" location="${xts.dir}/WS-T/dev/src10"/>
+ <property name="wstx.src.dir" location="${xts.dir}/WSTX/classes"/>
+ <property name="wstx11.src.dir" location="${xts.dir}/WSTX/classes11"/>
+ <property name="wstx10.src.dir" location="${xts.dir}/WSTX/classes10"/>
+
+ <property name="emma.dir" location="${root.dir}/build/extlib"/>
+
+ <property name="emma.report.dir" location="${xts.dir}/emma-report"/>
+
+ <path id="emma.lib" >
+ <pathelement location="${emma.dir}/emma.jar" />
+ <pathelement location="${emma.dir}/emma_ant.jar" />
+ </path>
+
+ <taskdef resource="emma_ant.properties" classpathref="emma.lib" />
+
+ <target name="report-both">
+ <mkdir dir="${emma.report.dir}"/>
+ <emma>
+ <report>
+ <fileset dir="${emma.report.dir}" >
+ <include name="coverage.ec"/>
+ <include name="metadata.emma"/>
+ </fileset>
+ <sourcepath>
+ <dirset dir="${wsas.src.dir}"/>
+ <dirset dir="${wscf.src.dir}"/>
+ <dirset dir="${wscf11.src.dir}"/>
+ <dirset dir="${wscf10.src.dir}"/>
+ <dirset dir="${ws-c.src.dir}"/>
+ <dirset dir="${ws-c11.src.dir}"/>
+ <dirset dir="${ws-c10.src.dir}"/>
+ <dirset dir="${ws-t.src.dir}"/>
+ <dirset dir="${ws-t11.src.dir}"/>
+ <dirset dir="${ws-t10.src.dir}"/>
+ <dirset dir="${wstx.src.dir}"/>
+ <dirset dir="${wstx11.src.dir}"/>
+ <dirset dir="${wstx10.src.dir}"/>
+ </sourcepath>
+ <txt outfile="${emma.report.dir}/coverage.txt" />
+ <html outfile="${emma.report.dir}/coverage.html" />
+ </report>
+ </emma>
+ </target>
+
+ <target name="report11">
+ <emma>
+ <report>
+ <fileset dir="${emma.report.dir}" >
+ <include name="coverage.ec"/>
+ <include name="metadata.emma"/>
+ </fileset>
+ <sourcepath>
+ <dirset dir="${wsas.src.dir}"/>
+ <dirset dir="${wscf.src.dir}"/>
+ <dirset dir="${wscf11.src.dir}"/>
+ <dirset dir="${wscf10.src.dir}"/>
+ <dirset dir="${ws-c.src.dir}"/>
+ <dirset dir="${ws-c11.src.dir}"/>
+ <dirset dir="${ws-c10.src.dir}"/>
+ <dirset dir="${ws-t.src.dir}"/>
+ <dirset dir="${ws-t11.src.dir}"/>
+ <dirset dir="${ws-t10.src.dir}"/>
+ <dirset dir="${wstx.src.dir}"/>
+ <dirset dir="${wstx11.src.dir}"/>
+ <dirset dir="${wstx10.src.dir}"/>
+ </sourcepath>
+ <txt outfile="${emma.report.dir}/coverage.txt" />
+ <html outfile="${emma.report.dir}/coverage.html" />
+ </report>
+ </emma>
+ </target>
+
+ <target name="report" depends="report11"/>
+</project>
Modified: labs/jbosstm/trunk/XTS/sharedbuild.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sharedbuild.xml 2010-05-14 07:50:36 UTC (rev 32880)
+++ labs/jbosstm/trunk/XTS/sharedbuild.xml 2010-05-14 08:03:07 UTC (rev 32881)
@@ -112,6 +112,9 @@
<!-- directory that contains emma.jar and emma_ant.jar: -->
<property name="emma.dir" value="${jbossts.build.extlib.dir}" />
+ <!-- directory where emma metadata should go -->
+ <property name="emma.report.dir" value="${root.dir}/emma-report" />
+
<path id="emma.lib" >
<pathelement location="${emma.dir}/emma.jar" />
<pathelement location="${emma.dir}/emma_ant.jar" />
@@ -159,7 +162,7 @@
<emma enabled="@{includeemma}">
<instr mode="overwrite"
- metadatafile="${xts.install.dir}/metadata.emma"
+ metadatafile="${emma.report.dir}/metadata.emma"
merge="true"
filter="@{emmafilter}">
<instrpath>
More information about the jboss-svn-commits
mailing list