From: Erik Brakkee <erik@brakkee.org>
Date: Thu, 9 Mar 2006 20:22:30 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: wamblee-utils-0.7~1171
X-Git-Url: http://wamblee.org/gitweb/?a=commitdiff_plain;h=cb15cddcf735ae480f78ddd398bd811e6429464f;p=utils

---

diff --git a/build/header.xml b/build/header.xml
index 092a9e36..260d482b 100644
--- a/build/header.xml
+++ b/build/header.xml
@@ -42,6 +42,21 @@
   </antcall>
 </target>
 
+<target name="commons-beanutils.d">
+  <antcall target="download.dep">
+    <param name="group" value="commons-beanutils"/>
+    <param name="version" value="1.7.0"/>
+  </antcall>
+</target>
+
+<target name="commons-collections.d">
+  <antcall target="download.dep">
+    <param name="group" value="commons-collections"/>
+    <param name="version" value="3.1"/>
+  </antcall>
+</target>
+
+
 <target name="commons-logging.d">
   <antcall target="download.dep">
     <param name="group" value="commons-logging"/>
@@ -156,10 +171,29 @@
   </antcall>
 </target>
 
+
+<target name="antlr.d">
+  <antcall target="download.dep">
+    <param name="group" value="antlr"/>
+    <param name="version" value="2.7.2"/>
+  </antcall>
+</target>
+
+<target name="checkstyle.d" depends="antlr.d,commons-beanutils.d,commons-logging.d,commons-collections.d">
+  <antcall target="download.dep">
+    <param name="group" value="checkstyle"/>
+    <param name="version" value="4.1"/>
+  </antcall>
+</target>
+
 <!-- common test dependencies for all test code --> 
 <target name="test.d" depends="junit.d,jmock.d,dbunit.d,emma.d">
 </target>
 
+<!-- downloaded dependencies for ant tasks --> 
+<target name="ant.d" depends="checkstyle.d">
+</target>
+
 
 
  <target name="import_header" unless="build_header_included">
@@ -192,6 +226,7 @@
     <property name="build.dir" value="${project.home}/build"/>
     <property name="lib.dir" value="${project.home}/lib/wamblee"/>
     <property name="ant.lib.dir" value="${project.home}/lib/ant"/>
+    <property name="ant.downloaded.lib.dir" value="${project.home}/lib/ant/downloaded"/>
     <property name="external.lib.dir" value="lib/external"/>
     <property name="test.lib.dir" value="lib/test"/>
     <property name="special.lib.dir" value="${project.home}/lib/special"/>
@@ -303,13 +338,17 @@
     <property name="emma.enabled" value="false"/>
     
     <!-- checkstyle -->
-    <!-- TMP download this dependence as well 
-    <property name="checkstyle.home" value="${lib.dir}/checkstyle-3.5"/>
-    <taskdef resource="checkstyletask.properties"
-             classpath="${checkstyle.home}/checkstyle-all-3.5.jar"/>
-    <property name="checkstyle.rules" value="coding-rules.xml"/>
-    <property name="checkstyle.test.rules" value="coding-rules-test.xml"/>
-    --> 
+    <property name="checkstyle.home" value="${ant.downloaded.lib.dir}"/>
+    <taskdef resource="checkstyletask.properties">
+      <classpath>
+        <fileset dir="${checkstyle.home}">
+	  <include name="*.jar"/>
+	</fileset>
+      </classpath>
+    </taskdef>
+    <property name="checkstyle.rules" value="style.xml"/>
+    <property name="checkstyle.test.rules" value="test-style.xml"/>
+    
              
     <!-- jalopy -->
     <!-- TMP download this dependence as well 
diff --git a/build/trailer.xml b/build/trailer.xml
index d5082a7c..0692cb9f 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>
@@ -57,7 +60,11 @@
 
 <target name="clean-deps" depends="init_directory_properties">
   <delete dir="${external.lib.dir}"/>
+  <mkdir dir="${external.lib.dir}"/>
   <delete dir="${test.lib.dir}"/>
+  <mkdir dir="${test.lib.dir}"/>
+  <delete dir="${ant.downloaded.lib.dir}"/>
+  <mkdir dir="${ant.downloaded.lib.dir}"/>
 </target>
 
 <!-- ============================================================================
@@ -238,15 +245,23 @@
 
 <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">
+		failOnViolation="false">
+		<classpath>
+		  <pathelement path="${module.testbuild.path}"/>
+		</classpath>
 		<fileset dir="${module.test.dir}" includes="**/*.java" />
 		<formatter type="plain" />
 	</checkstyle>
+	-->
 </target>
 
 <!-- ============================================================================