svn commit: r1605838 - in /ofbiz/trunk: common.xml framework/base/build.xml framework/sql/build.xml

[doogie-3]

Author: doogie
Date: Thu Jun 26 16:15:15 2014
New Revision: 1605838

URL: http://svn.apache.org/r1605838
Log:
Fix cobertura-report when source has been generated(aka, when javacc or
jjtree has been used).

Modified:
    ofbiz/trunk/common.xml
    ofbiz/trunk/framework/base/build.xml
    ofbiz/trunk/framework/sql/build.xml

Modified: ofbiz/trunk/common.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/common.xml?rev=1605838&r1=1605837&r2=1605838&view=diff
==============================================================================
--- ofbiz/trunk/common.xml (original)
+++ ofbiz/trunk/common.xml Thu Jun 26 16:15:15 2014
@@ -129,6 +129,10 @@ under the License.
         <run-junit/>
     </target>
 
+    <patternset id="cobertura-src-dirs">
+        <include name="src"/>
+    </patternset>
+
     <target name="tests-cobertura" depends="jar">
         <mkdir dir="${build.dir}/cobertura-lib"/>
         <taskdef resource="tasks.properties" classpathref="cobertura.class.path"/>
@@ -143,8 +147,7 @@ under the License.
         <mkdir dir="${build.dir}/test-results/cobertura-report"/>
         <cobertura-report datafile="${build.dir}/test-results/cobertura.dat" destdir="${build.dir}/test-results/cobertura-report">
             <dirset dir=".">
-                <patternset refid="src-dirs"/>
-                <include name="src"/>
+                <patternset refid="cobertura-src-dirs"/>
             </dirset>
 
             <include name="**/*.java"/>

Modified: ofbiz/trunk/framework/base/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/build.xml?rev=1605838&r1=1605837&r2=1605838&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/build.xml (original)
+++ ofbiz/trunk/framework/base/build.xml Thu Jun 26 16:15:15 2014
@@ -60,6 +60,11 @@ under the License.
         <file name="org/ofbiz/base/concurrent/test/TTLCachedObjectTest.java"/>
     </filelist>
 
+    <patternset id="cobertura-src-dirs">
+        <include name="build/gen-src"/>
+        <include name="src"/>
+    </patternset>
+
     <target name="init">
         <!-- make sure we have crypto packages available -->
         <condition property="exclude.crypto" value="org/ofbiz/base/crypto/**">

Modified: ofbiz/trunk/framework/sql/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/build.xml?rev=1605838&r1=1605837&r2=1605838&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/build.xml (original)
+++ ofbiz/trunk/framework/sql/build.xml Thu Jun 26 16:15:15 2014
@@ -47,6 +47,11 @@ under the License.
         <file name="org/ofbiz/sql/test/SelectTest.java"/>
         <file name="org/ofbiz/sql/test/SQLTest.java"/>
     </filelist>
+    <patternset id="cobertura-src-dirs">
+        <include name="build/gen-src/javacc"/>
+        <include name="build/gen-src/jjtree"/>
+        <include name="src"/>
+    </patternset>
 
     <!-- ================================================================== -->
     <!-- Compilation of the source files                                                                                                                         -->