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

diff --git a/build/trailer.xml b/build/trailer.xml
index b93f4279..a57b7da3 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>
@@ -56,8 +59,15 @@
 </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 +163,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 +184,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 +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" />
@@ -203,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"/>
@@ -237,12 +250,18 @@
 
 <target name="checkstyle" depends="testclasses">
 	<checkstyle config="${build.dir}/${checkstyle.rules}"
-		failOnViolation="false" classpathref="module.testbuild.path">
+		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}"
-		failOnViolation="false" classpathref="module.testbuild.path">
+	<checkstyle config="${build.dir}/${checkstyle.rules}"
+		failOnViolation="false">
+		<classpath>
+		  <pathelement path="${module.testbuild.path}"/>
+		</classpath>
 		<fileset dir="${module.test.dir}" includes="**/*.java" />
 		<formatter type="plain" />
 	</checkstyle>