(no commit message)

[utils] / build / trailer.xml

diff --git a/build/trailer.xml b/build/trailer.xml
index d5082a7ce6403e635cf117a4b93b3b8a562bedef..a57b7da32c38c10f7affaaefb5b0008028a4e7c5 100644 (file)
--- 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>
 
 <!-- ============================================================================
@@ -162,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>
 
 <!-- ============================================================================
@@ -177,6 +188,7 @@
                classpath="${module.classpath}"
                sourcepath="${module.source.dir}">
        </javadoc>
+       <echo>Results are available in ${module.doccheck.dir}"</echo>
 </target>
 
 <!-- ============================================================================
@@ -189,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" />
@@ -204,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"/>
@@ -238,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>