X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=build%2Fheader.xml;h=9fac8d996385a4d193dde646d0bd29e82fdc137d;hb=1f136edfa63a01712397bd9a7a7ac38c52e4f447;hp=ab9c06f61d58c18d490f1a6c2cd423713384a146;hpb=e25dee598400f0914c4212059b2c829de3ef3bf6;p=utils

diff --git a/build/header.xml b/build/header.xml
index ab9c06f6..9fac8d99 100644
--- a/build/header.xml
+++ b/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>
@@ -188,34 +189,34 @@
   </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}">
-      <include name="support.jar"/>
+      <include name="wamblee-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"/>
+      <include name="wamblee-support-test.jar"/>
     </fileset>
   </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}">
-      <include name="crawler-basic.jar"/>
+      <include name="wamblee-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"/>
+      <include name="wamblee-crawler-basic-test.jar"/>
     </fileset>
   </copy>
 </target>
@@ -319,12 +320,9 @@
    
     <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="${build.dir}/lib/external"/>
+    <property name="external.lib.dir" value="lib/external"/>
     <property name="test.lib.dir" value="lib/test"/>
     <property name="special.lib.dir" value="${build.dir}/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="build.properties.dir" value="${project.home}" />
     <property name="build.properties.name" value="build.properties" />
     
@@ -506,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" />
 
@@ -632,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: 
       
@@ -639,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