X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=build%2Fheader.xml;h=a06b43311cb72e95759b586d0fce6914db25f98a;hb=df6ecb4df32034cbce7f9cd87961ba7e59da089e;hp=260d482beaa47ba05876f29a7ea883ac7beabea4;hpb=cb15cddcf735ae480f78ddd398bd811e6429464f;p=utils

diff --git a/build/header.xml b/build/header.xml
index 260d482b..a06b4331 100644
--- a/build/header.xml
+++ b/build/header.xml
@@ -9,8 +9,17 @@
 </target>
 
 
+<property name="project.home" value=".."/>
+<property name="build.dir" value="${project.home}/build"/>
+<property name="lib.dir" value="${project.home}/lib"/>
 
 <target name="download.dep">
+  <if>
+    <isset property="proxyhost"/>
+    <then>
+      <setproxy proxyhost="${proxyhost}" proxyport="${proxyport}"/>
+    </then>
+  </if>
   <if>
     <isset property="artifact"/>
     <then>
@@ -65,6 +74,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>
 
@@ -73,16 +99,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"/>
@@ -126,6 +156,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"/>
@@ -222,17 +316,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.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" />
     
@@ -414,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" />
 
@@ -450,7 +537,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"
@@ -463,6 +550,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 
@@ -500,6 +589,9 @@
     
       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.