build results now in subdir of project dir instead of in subdir of build

[utils] / build / header.xml

diff --git a/build/header.xml b/build/header.xml
index fe98f0a0f7d87c7797423bffe7a0b52d82303d56..a06b43311cb72e95759b586d0fce6914db25f98a 100644 (file)
--- a/build/header.xml
+++ b/build/header.xml
@@ -11,7 +11,7 @@
 
 <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"/>
 
 <target name="download.dep">
   <if>
@@ -81,6 +81,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 +105,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 +188,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 +204,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 +317,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 +503,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" />