X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=build%2Ftrailer.xml;h=f5b63efc525de30f63ae580da051afd905c631bd;hb=f33d5264df19fadc75d977fc0f28656bb3cb81c7;hp=b93f427946df82fcd0a2c72231dde3cd3ad94d3f;hpb=dd05ce755afaefa6d3c64c6febf7d242b25b36c0;p=utils

diff --git a/build/trailer.xml b/build/trailer.xml
index b93f4279..f5b63efc 100644
--- a/build/trailer.xml
+++ b/build/trailer.xml
@@ -40,6 +40,9 @@
   <antcall target="test.d">
     <param name="download.dir" value="${test.lib.dir}"/>
   </antcall>
+  <antcall target="ant.d">
+    <param name="download.dir" value="${ant.downloaded.lib.dir}"/>
+  </antcall>
   <antcall target="module.test.deps">
     <param name="download.dir" value="${test.lib.dir}"/>
   </antcall>
@@ -53,11 +56,19 @@
 	<delete dir="${module.docbase.dir}" />
 	<delete dir="${module.report.dir}" />
 	<delete dir="${module.sql.dir}" />
+	<delete dir="${module.build.dir}"/>
 </target>
 
 <target name="clean-deps" depends="init_directory_properties">
-  <delete dir="${external.lib.dir}"/>
-  <delete dir="${test.lib.dir}"/>
+  <delete>
+    <fileset dir="${external.lib.dir}" includes="*"/>
+  </delete>
+  <delete>
+    <fileset dir="${test.lib.dir}" includes="*"/>
+  </delete>
+  <delete>
+    <fileset dir="${ant.downloaded.lib.dir}" includes="*"/>
+  </delete>
 </target>
 
 <!-- ============================================================================
@@ -153,13 +164,16 @@
 	<javadoc packagenames="*" author="true" version="true" private="yes"
 		source="${javac.source}" doclet="com.tarsec.javadoc.pdfdoclet.PDFDoclet"
 		docletpathref="pdfdoclet.path"
+		classpath="${module.classpath}"
+		sourcepath="${module.source.dir}"
 		additionalparam="-pdf ${module.pdfdoc.dir}/${module.name}.pdf">
-		<fileset dir="${module.source.dir}">
+		<!-- fileset dir="${module.source.dir}">
 			<include name="**/*.java" />
-		</fileset>
+		</fileset -->
 	</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>
 
 <!-- ============================================================================
@@ -171,11 +185,11 @@
 	<javadoc packagenames="*" destdir="${module.doccheck.dir}"
 		author="true" version="true"
 		doclet="com.sun.tools.doclets.doccheck.DocCheck"
-		docletpathref="doccheck.path" source="${javac.source}">
-		<fileset dir="${module.source.dir}">
-			<include name="**/*.java" />
-		</fileset>
+		docletpathref="doccheck.path" 
+		classpath="${module.classpath}"
+		sourcepath="${module.source.dir}">
 	</javadoc>
+	<echo>Results are available in ${module.doccheck.dir}"</echo>
 </target>
 
 <!-- ============================================================================
@@ -188,7 +202,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" />
@@ -203,7 +217,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"/>
@@ -235,17 +249,33 @@
 	Check style, 
 	============================================================================ -->
 
-<target name="checkstyle" depends="testclasses">
-	<checkstyle config="${build.dir}/${checkstyle.rules}"
-		failOnViolation="false" classpathref="module.testbuild.path">
-		<fileset dir="${module.source.dir}" includes="**/*.java" />
-		<formatter type="plain" />
-	</checkstyle>
-	<checkstyle config="${build.dir}/${checkstyle.test.rules}"
-		failOnViolation="false" classpathref="module.testbuild.path">
-		<fileset dir="${module.test.dir}" includes="**/*.java" />
-		<formatter type="plain" />
+<target name="checkstyle-impl">
+   <checkstyle config="${build.dir}/${checkstyle.rules}"
+		failOnViolation="false">
+		<classpath>
+		  <pathelement path="${checkstyle.classpath}"/>
+		</classpath>
+		<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>
 
 <!-- ============================================================================
@@ -441,6 +471,26 @@
     </emma>
   </target>
 
+<!-- =======================================================================
+   FORREST
+   ======================================================================-->
+  <target name="forrest" description="runs Forrest">
+    <property name="forrest.home" location="${env.FORREST_HOME}" />
+    <property name="forrest.ant.home" location="${forrest.home}/tools/ant" />
+    <java classname="org.apache.tools.ant.Main" fork="true" failonerror="true" maxmemory="128M">
+      <classpath>
+        <fileset dir="${forrest.ant.home}/lib">
+          <include name="*.jar" />
+        </fileset>
+        <pathelement path="${java.home}/../lib/tools.jar" />
+      </classpath>
+      <sysproperty key="ant.home" value="${forrest.ant.home}" />
+      <sysproperty key="forrest.home" value="${forrest.home}" />
+      <sysproperty key="basedir" value="${basedir}" />
+      <sysproperty key="java.endorsed.dirs" value="${forrest.home}/lib/endorsed" />
+      <arg line="-f ${forrest.home}/main/forrest.build.xml" />
+    </java>
+  </target> 
 
 <!--  ============================================================================
       Database targets