(no commit message)

[utils] / build / trailer.xml

diff --git a/build/trailer.xml b/build/trailer.xml
index a57b7da32c38c10f7affaaefb5b0008028a4e7c5..a5a86335850a471b8a95f810d4665beef7a3b86a 100644 (file)
--- a/build/trailer.xml
+++ b/build/trailer.xml
@@ -248,23 +248,33 @@
        Check style, 
        ============================================================================ -->
 
-<target name="checkstyle" depends="testclasses">
-       <checkstyle config="${build.dir}/${checkstyle.rules}"
-               failOnViolation="false">
-               <classpath>
-                 <path refid="module.build.path"/>
-               </classpath>
-               <fileset dir="${module.source.dir}" includes="**/*.java" />
-               <formatter type="plain" />
-       </checkstyle>
-       <checkstyle config="${build.dir}/${checkstyle.rules}"
+<target name="checkstyle-impl">
+   <checkstyle config="${build.dir}/${checkstyle.rules}"
                failOnViolation="false">
                <classpath>
-                 <pathelement path="${module.testbuild.path}"/>
+                 <pathelement path="${checkstyle.classpath}"/>
                </classpath>
-               <fileset dir="${module.test.dir}" includes="**/*.java" />
-               <formatter type="plain" />
+               <fileset dir="${checkstyle.srcdir}" includes="**/*.java"/>
+               <formatter type="xml" tofile="${module.checkstyle.dir}/${checkstyle.report}.xml"/>
        </checkstyle>
+       <style style="${build.dir}/checkstyle-simple.xsl"
+                  in="${module.checkstyle.dir}/${checkstyle.report}.xml"
+                  out="${module.checkstyle.dir}/${checkstyle.report}.html"/>
+       <echo>Results are available at ${module.checkstyle.dir}/${checkstyle.report}.html</echo>
+</target>
+
+<target name="checkstyle" depends="testclasses">
+    <mkdir dir="${module.checkstyle.dir}"/>
+       <antcall target="checkstyle-impl">
+         <param name="checkstyle.classpath" refid="module.build.path"/>
+         <param name="checkstyle.srcdir" value="${module.source.dir}"/>
+         <param name="checkstyle.report" value="source-results"/>
+       </antcall>
+       <antcall target="checkstyle-impl">
+         <param name="checkstyle.classpath" refid="module.testbuild.path"/>
+         <param name="checkstyle.srcdir" value="${module.test.dir}"/>
+         <param name="checkstyle.report" value="test-results"/>
+       </antcall>
 </target>
 
 <!-- ============================================================================