X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=trunk%2Fbuild%2Fheader.xml;h=930517a64762688e5e36f92f836a8e5351519345;hb=d4cda0c5fecd8f0ea1fece9af85245ead59c67d4;hp=df55a859ef4eb327a19cb794aaafeff8e53ded85;hpb=afe99ef413553df7ab110670ae96979e24198537;p=utils

diff --git a/trunk/build/header.xml b/trunk/build/header.xml
index df55a859..930517a6 100644
--- a/trunk/build/header.xml
+++ b/trunk/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,18 +204,18 @@
   </copy>
 </target>
 
-<property name="crawler.dist.dir" value="${lib.dir}/crawler"/>
+<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.jar"/>
+      <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-test.jar"/>
+      <include name="crawler-basic-test.jar"/>
     </fileset>
   </copy>
 </target>
@@ -308,11 +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="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"/>
@@ -533,7 +542,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"
@@ -546,6 +555,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