X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=build%2Fheader.xml;h=efc6967afa6ac835acf1cb58a8d947108bd9b473;hb=9bfd4244cc2ec52d95392f16e8cef147f0a5390b;hp=33a8cd00530618c12d709cdf418d14c1d47a32dd;hpb=d8f48d3db7b27bafd499fd2d82f2caaaf86b57a1;p=utils

diff --git a/build/header.xml b/build/header.xml
index 33a8cd00..efc6967a 100644
--- a/build/header.xml
+++ b/build/header.xml
@@ -9,8 +9,18 @@
 </target>
 
 
+<property name="project.home" value=".."/>
+<property name="build.dir" value="${project.home}/build"/>
+<property name="lib.dir" value="${project.home}/lib"/>
+<property environment="env"/>
 
 <target name="download.dep">
+  <if>
+    <isset property="proxyhost"/>
+    <then>
+      <setproxy proxyhost="${proxyhost}" proxyport="${proxyport}"/>
+    </then>
+  </if>
   <if>
     <isset property="artifact"/>
     <then>
@@ -42,6 +52,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"/>
@@ -50,6 +75,23 @@
   </antcall>
 </target>
 
+<target name="commons-codec.d">
+  <antcall target="download.dep">
+    <param name="group" value="commons-codec"/>
+    <param name="version" value="1.3"/>
+  </antcall>
+</target>
+
+<target name="commons-email.d">
+  <antcall target="download.dep">
+    <param name="group" value="commons-email"/>
+    <param name="version" value="1.0"/>
+  </antcall>
+</target>
+
+
+
+
 <target name="logging.d" depends="log4j.d,commons-logging.d">
 </target>
 
@@ -58,16 +100,20 @@
     <param name="group" value="dom4j"/>
     <param name="version" value="1.6"/>
   </antcall>
+  <antcall target="download.dep">
+    <param name="group" value="jaxen"/>
+    <param name="version" value="1.1-beta-4"/>
+  </antcall>
 </target>
 
-<target name="xerces.d">
+<target name="ehcache.d">
   <antcall target="download.dep">
     <param name="group" value="ehcache"/>
     <param name="version" value="1.1"/>
   </antcall>
 </target>
 
-<target name="ehcache.d">
+<target name="xerces.d">
   <antcall target="download.dep">
     <param name="group" value="xerces"/>
     <param name="version" value="2.4.0"/>
@@ -111,6 +157,70 @@
   </antcall>
 </target>
 
+<target name="activation.d">
+  <copy todir="${download.dir}">
+    <fileset dir="${special.lib.dir}/jaf-1.0.2">
+       <include name="*.jar"/>
+    </fileset>
+  </copy>
+</target>
+
+<target name="mail.d" depends="activation.d">
+  <copy todir="${download.dir}">
+    <fileset dir="${special.lib.dir}/javamail-1.3.3_01">
+       <include name="*.jar"/>
+    </fileset>
+  </copy>
+</target>
+
+
+
+<target name="httpclient.d">
+  <antcall target="download.dep">
+    <param name="group" value="commons-httpclient"/>
+    <param name="version" value="3.0"/>
+  </antcall>
+</target>
+
+<target name="jtidy.d">
+  <antcall target="download.dep">
+    <param name="group" value="jtidy"/>
+    <param name="version" value="4aug2000r7-dev"/>
+  </antcall>
+</target>
+
+<property name="support.dist.dir" value="${lib.dir}/wamblee/support"/>
+<target name="wamblee.support.d">
+  <copy todir="${download.dir}">
+    <fileset dir="${support.dist.dir}">
+      <include name="support.jar"/>
+    </fileset>
+  </copy>
+</target>
+<target name="wamblee.support.test.d">
+  <copy todir="${download.dir}">
+    <fileset dir="${support.dist.dir}">
+      <include name="support-test.jar"/>
+    </fileset>
+  </copy>
+</target>
+
+<property name="crawler.dist.dir" value="${lib.dir}/wamblee/crawler/basic"/>
+<target name="wamblee.crawler.d">
+  <copy todir="${download.dir}">
+    <fileset dir="${crawler.dist.dir}">
+      <include name="crawler-basic.jar"/>
+    </fileset>
+  </copy>
+</target>
+<target name="wamblee.crawler.test.d">
+  <copy todir="${download.dir}">
+    <fileset dir="${crawler.dist.dir}">
+      <include name="crawler-basic-test.jar"/>
+    </fileset>
+  </copy>
+</target>
+
 <target name="junit.d">
   <antcall target="download.dep">
     <param name="group" value="junit"/>
@@ -156,10 +266,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">
@@ -188,16 +317,12 @@
       <!--  The project.home property can also be overriden in a build.xml
             in case the source is in a subdirectory and not necessarily
             in the top-level directory --> 
-    <property name="project.home" value=".."/>
-    <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.lib.dir" value="${build.dir}/lib/ant"/>
+    <property name="ant.downloaded.lib.dir" value="${build.dir}/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"/>
-    <property name="forrest.xdocs.dir" value="${project.home}/site/xdocs"/>
-    <property name="forrest.build.dir" value="${project.home}/site/build"/>
-    <property name="forrest.build.site.dir" value="${forrest.build.dir}/site"/>
+    <property name="special.lib.dir" value="${build.dir}/lib/special"/>
     <property name="build.properties.dir" value="${project.home}" />
     <property name="build.properties.name" value="build.properties" />
     
@@ -230,6 +355,18 @@
     <!-- JUnit -->
     <property name="junit.halt.on.failure" value="false"/>
     <property name="unitreport" value="cl-unit.xml"/>
+    
+    <!-- DocCheck path -->
+    <property name="doccheck.home" value="${ant.lib.dir}/doccheck1.2b2/doccheck.jar"/>
+    <path id="doccheck.path">
+      <pathelement location="${doccheck.home}"/>
+    </path>
+    
+    <!-- PdfDoclet path -->
+    <property name="pdfdoclet.home" value="${ant.lib.dir}/pdfdoclet-1.0.2-all.jar"/>
+    <path id="pdfdoclet.path">
+      <pathelement location="${pdfdoclet.home}"/>
+    </path>
         
     <!-- Hibernate paths --> 
     <!--  name of the file in the source directory containing
@@ -291,13 +428,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 
@@ -363,14 +504,12 @@
 	               replace="/"
 	               global="true"
 	               defaultValue="${module.name}"/>
-	<property name="module.build.dir"
-		value="${build.dir}/${module.reldir}" />
-
+	<!-- property name="module.build.dir"
+		value="${build.dir}/${module.reldir}" / -->
+    <property name="module.build.dir" value="build"/>
 	<property name="module.api.forrest.dir" value="${forrest.build.site.dir}/api/${module.name}" />
-	<!-- property name="module.classes.dir"     value="${module.build.dir}/bin"/ -->
-	<!-- property name="module.testclasses.dir" value="${module.build.dir}/testbin"/ -->
-	<property name="module.classes.dir" value="bin" />
-	<property name="module.testclasses.dir" value="testbin" />
+	<property name="module.classes.dir" value="${module.build.dir}/bin" />
+	<property name="module.testclasses.dir" value="${module.build.dir}/testbin" />
 	<!-- Directory where generated SQL will be put by the schema export-->
 	<property name="module.sql.dir" value="${module.build.dir}/sql" />
 
@@ -399,7 +538,7 @@
         <property name="module.emmareport.dir"
 	        value="${module.report.dir}/html/emma"/>
 	<property name="module.docbase.dir"
-		value="${module.build.dir}/javadoc" />
+		value="${module.build.dir}/docs" />
 	<property name="module.javadoc.dir"
 		value="${module.docbase.dir}/api" />
 	<property name="module.javadocjar.name"
@@ -412,6 +551,8 @@
 		value="${module.docbase.dir}/pdf" />
 	<property name="module.doccheck.dir"
 		value="${module.docbase.dir}/doccheck" />
+	<property name="module.checkstyle.dir"
+	    value="${module.docbase.dir}/checkstyle" />
 	<property name="module.jar.name" value="${module.name}.jar" />
 	
 	<!--  Replace the dash by a / to create a relative directory 
@@ -446,6 +587,16 @@
   
   <target name="help-impl">
     <echo>
+    
+      Preparation:
+      
+      To execute with a specific proxy host and port, start ant with the 
+      command-line options   -Dproxyhost=hostname -Dproxyport=portnumber.
+      
+      deps:          Download dependencies, this is necessary for using 
+                     any of the build targets.
+      clean-deps:    Remove downloaded dependencies. 
+      
       General build targets: 
       
       clean:         Cleans up all build results (excluding the dist location).
@@ -477,6 +628,10 @@
       
       javadoc:       Generates javadoc. Target: ${module.javadoc.dir} 
       doccheck:      Checks documentation. Target: ${module.doccheck.dir}
+	  
+	  Forrest:
+	  
+	  forrest:       Generates project docs using forrest. 
       
       Code analysis: 
       
@@ -484,7 +639,7 @@
       format:        Formats to the code in accordance with the checkstyle rules.
       simian:        Analyse similarities in the code.
       
-      Database targets: 
+      Database targets:  ** database targets are not functional yet **
       
       For all targets below the database is configured using 
       hibernate.properties (hibernate.dialect property) and