[jboss-svn-commits] JBL Code SVN: r30972 - in labs/jbosstm/trunk: antbuildsystem and 1 other directories.

Thu Jan 7 10:58:43 EST 2010

Author: jhalliday
Date: 2010-01-07 10:58:42 -0500 (Thu, 07 Jan 2010)
New Revision: 30972

Modified:
   labs/jbosstm/trunk/antbuildsystem/build.xml
   labs/jbosstm/trunk/common/build.xml
   labs/jbosstm/trunk/sharedbuild.xml
Log:
Add emma code coverage tool to the build scripts. JBTM-682


Modified: labs/jbosstm/trunk/antbuildsystem/build.xml
===================================================================

--- labs/jbosstm/trunk/antbuildsystem/build.xml	2010-01-07 15:58:00 UTC (rev 30971)
+++ labs/jbosstm/trunk/antbuildsystem/build.xml	2010-01-07 15:58:42 UTC (rev 30972)
@@ -22,12 +22,10 @@
 
     <property name="modulename" value="buildsystem"/>
 
-    <property name="emma.enabled" value="false"/>
-
     <import file="../sharedbuild.xml"/>
 
     <target name="compile" depends="init">
-        <compile.macro includeant="true"/>
+        <compile.macro includeant="true" includeemma="false"/>
     </target>
 
     <target name="compile-tests"/>

Modified: labs/jbosstm/trunk/common/build.xml
===================================================================
--- labs/jbosstm/trunk/common/build.xml	2010-01-07 15:58:00 UTC (rev 30971)
+++ labs/jbosstm/trunk/common/build.xml	2010-01-07 15:58:42 UTC (rev 30972)
@@ -87,6 +87,7 @@
                     <include name="coverage.ec"/>
                     <include name="metadata.emma"/>
                 </fileset>
+                <!-- TODO emma incorrectly resolves this as <tsroot>/build not <tsroot>/common/build - investigate/workaround -->
                 <txt outfile="${build.dir}/emma/coverage.txt" />
                 <html outfile="${build.dir}/emma/coverage.html" />
             </report>

Modified: labs/jbosstm/trunk/sharedbuild.xml
===================================================================
--- labs/jbosstm/trunk/sharedbuild.xml	2010-01-07 15:58:00 UTC (rev 30971)
+++ labs/jbosstm/trunk/sharedbuild.xml	2010-01-07 15:58:42 UTC (rev 30972)
@@ -101,6 +101,7 @@
 
         <attribute name="excluded.classes" default="${excluded.classes}"/>
         <attribute name="includeant" default="false"/>
+        <attribute name="includeemma" default="${emma.enabled}"/>
 
         <element name="additional.classpath" optional="true"/>
         <element name="additional.src.dirs" optional="true"/>
@@ -118,7 +119,7 @@
             <additional.src.dirs/>
         </javac>
 
-        <emma enabled="${emma.enabled}">
+        <emma enabled="@{includeemma}">
             <instr mode="overwrite"
                    metadatafile="${build.dir}/metadata.emma"
                    merge="true">
@@ -490,7 +491,7 @@
             <classpath>
                 <pathelement location="etc"/>
                 <pathelement location="${build.dir}/lib/${modulename}.jar"/>
-                <!--<pathelement location="${build.dir}/classes/"/>-->
+                <pathelement location="${build.dir}/classes/"/>
                 <pathelement location="${build.dir}/tests/"/>
                 <fileset dir="${build.dir}/lib/ext/" includes="*"/>
                 <fileset dir="${basedir}" includes="${lib.dir}/ext/*"/>

