X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=trunk%2Fbuild%2Fheader.xml;h=efc6967afa6ac835acf1cb58a8d947108bd9b473;hb=d6a858bf5cbbcf93a0969a7e31d0d2ce70f666bf;hp=fe98f0a0f7d87c7797423bffe7a0b52d82303d56;hpb=dd8ebb343a6ac7a6dafc5522f7195a97755d3b73;p=utils

diff --git a/trunk/build/header.xml b/trunk/build/header.xml
index fe98f0a0..efc6967a 100644
--- a/trunk/build/header.xml
+++ b/trunk/build/header.xml
@@ -11,7 +11,8 @@
 
 <property name="project.home" value=".."/>
 <property name="build.dir" value="${project.home}/build"/>
-<property name="lib.dir" value="${project.home}/lib/wamblee"/>
+<property name="lib.dir" value="${project.home}/lib"/>
+<property environment="env"/>
 
 <target name="download.dep">
   <if>
@@ -81,6 +82,15 @@
   </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>
@@ -96,14 +106,14 @@
   </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"/>
@@ -179,7 +189,7 @@
   </antcall>
 </target>
 
-<property name="support.dist.dir" value="${lib.dir}/support"/>
+<property name="support.dist.dir" value="${lib.dir}/wamblee/support"/>
 <target name="wamblee.support.d">
   <copy todir="${download.dir}">
     <fileset dir="${support.dist.dir}">
@@ -195,7 +205,7 @@
   </copy>
 </target>
 
-<property name="crawler.dist.dir" value="${lib.dir}/crawler/basic"/>
+<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}">
@@ -308,14 +318,11 @@
             in case the source is in a subdirectory and not necessarily
             in the top-level directory --> 
    
-    <property name="ant.lib.dir" value="${project.home}/lib/ant"/>
-    <property name="ant.downloaded.lib.dir" value="${project.home}/lib/ant/downloaded"/>
+    <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" />
     
@@ -497,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" />
 
@@ -623,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: 
       
@@ -630,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