Moved lib directory to build (excluding generated jars).

[utils] / build / trailer.xml

diff --git a/build/trailer.xml b/build/trailer.xml
index 106b4d6ec2196279b2d0244a0277f7d8e1d5cb81..a5a86335850a471b8a95f810d4665beef7a3b86a 100644 (file)
--- a/build/trailer.xml
+++ b/build/trailer.xml
@@ -172,6 +172,7 @@
        </javadoc>
        <echo
                message="Unfortuantely, this target will have generated some errors but the pdf will still look fine" />
+       <echo>Result is available in ${module.pdfdoc.dir}"</echo>
 </target>
 
 <!-- ============================================================================
@@ -187,6 +188,7 @@
                classpath="${module.classpath}"
                sourcepath="${module.source.dir}">
        </javadoc>
+       <echo>Results are available in ${module.doccheck.dir}"</echo>
 </target>
 
 <!-- ============================================================================
@@ -199,7 +201,7 @@
   </delete> 
 </target>
        
-<target name="dist-lite-product" depends="jar">
+<target name="dist-lite-product" depends="deps,jar">
     <mkdir dir="${module.dist.dir}"/>
        <delete>
                <fileset dir="${module.dist.dir}" excludes="**/CVS" />
@@ -214,7 +216,7 @@
        </copy>
 </target>
 
-<target name="dist-lite-test" depends="testclasses">
+<target name="dist-lite-test" depends="deps,testclasses">
     <jar destfile="${module.dist.dir}/${module.testjar.name}"
                basedir="${module.testclasses.dir}" 
                includes="**/*.class"/>
@@ -246,25 +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.test.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>
 
 <!-- ============================================================================