vmassol 01/04/07 06:18:14
Modified: cactus/build build.xml
Log:
removed the generation of the dependencies zip + dist target now suffix names with
date instead of version + updates for new jakarta skin
Revision Changes Path
1.2 +33 -75 jakarta-commons-sandbox/cactus/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/cactus/build/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2001/03/31 20:22:35 1.1
+++ build.xml 2001/04/07 13:18:13 1.2
@@ -118,7 +118,6 @@
<property name="out.classes.ant.dir" value="${out.root.dir}/classes"/>
<property name="out.src.ant.dir" value="${out.root.dir}/src"/>
<property name="out.conf.ant.dir" value="${out.root.dir}/conf"/>
- <property name="out.lib.dir" value="${out.root.dir}/lib"/>
<!--
========================================================================
@@ -143,10 +142,6 @@
with a link pointing to javadoc : <htdocs>/servletXX/index.html -->
<property name="site.name" value="${project.name}-website"/>
- <!-- Name of the dependencies zip files containing all external
- dependencies -->
- <property name="dependencies.name" value="${project.name}-dependencies"/>
-
<!--
========================================================================
Full names of deliverables
@@ -163,32 +158,8 @@
with a link pointing to javadoc : <htdocs>/servletXX/index.html -->
<property name="final.site.name" value="${out.root.dir}/${site.name}"/>
- <!-- Name of the dependencies zip files containing all external
- dependencies -->
- <property name="final.dependencies.name"
value="${out.root.dir}/${dependencies.name}.zip"/>
-
<!--
========================================================================
- Full names of distributables
- ========================================================================
- -->
-
- <!-- The Cactus jar containing custom Ant tasks and helper classes -->
- <property name="dist.jar.ant.name"
value="${dist.dir}/${jar.ant.name}-${project.version}.jar"/>
-
- <!-- The full sources of Cactus in a zip file -->
- <property name="dist.src.name"
value="${dist.dir}/${src.name}-${project.version}.zip"/>
-
- <!-- The Cactus web site in a gzip file (without the Javadoc but
- with a link pointing to javadoc : <htdocs>/servletXX/index.html -->
- <property name="dist.site.name" value="${dist.dir}/${site.name}"/>
-
- <!-- Name of the dependencies zip files containing all external
- dependencies -->
- <property name="dist.dependencies.name"
value="${dist.dir}/${dependencies.name}-${project.version}.zip"/>
-
- <!--
- ========================================================================
Useful file patterns for targets
========================================================================
-->
@@ -251,8 +222,25 @@
<echo message=""/>
<echo message="java.home = ${java.home}"/>
<echo message="user.home = ${user.home}"/>
+ <echo message="ant.home = ${ant.home}"/>
<echo message=""/>
+ <!-- Full names of distributables. They are defined here because the
+ properties need to have a valid ${DSTAMP} property set and the
+ tstamp task need to be located in a target -->
+
+ <!-- The Cactus jar containing custom Ant tasks and helper classes -->
+ <property name="dist.jar.ant.name"
+ value="${dist.dir}/${jar.ant.name}-${DSTAMP}.jar"/>
+
+ <!-- The full sources of Cactus in a zip file -->
+ <property name="dist.src.name"
+ value="${dist.dir}/${src.name}-${DSTAMP}.zip"/>
+
+ <!-- The Cactus web site in a gzip file (without the Javadoc but
+ with a link pointing to javadoc : <htdocs>/servletXX/index.html -->
+ <property name="dist.site.name" value="${dist.dir}/${site.name}"/>
+
<!-- Filters -->
<filter token="version" value="${project.version}"/>
<filter token="year" value="${year}"/>
@@ -290,8 +278,6 @@
<echo message=" tests-functional --> run the functional tests"/>
<echo message=" tests --> run both the unit and functional
tests"/>
<echo message=" clean --> cleans up the build directory"/>
- <echo message=" dependencies --> generate a zip file containing all"/>
- <echo message=" external dependencies"/>
<echo message=" all --> do it all at once (clean, jar,
sample"/>
<echo message=" source, doc, site, tests, dist)"/>
<echo message=" dist --> version all distributables and
copies"/>
@@ -366,13 +352,15 @@
<target name="source" depends="prepare-source">
- <zip zipfile="${final.src.name}" basedir=".">
+ <zip zipfile="${final.src.name}">
- <exclude name="${out.root.dir}/**"/>
- <exclude name="**/build.properties"/>
- <exclude name="**/*.log"/>
- <exclude name="**/*.bak"/>
- <exclude name="**/*.class"/>
+ <fileset dir=".">
+ <exclude name="${out.root.dir}/**"/>
+ <exclude name="**/build.properties"/>
+ <exclude name="**/*.log"/>
+ <exclude name="**/*.bak"/>
+ <exclude name="**/*.class"/>
+ </fileset>
</zip>
@@ -409,6 +397,7 @@
<target name="prepare-site" depends="init">
<mkdir dir="${out.site.dir}"/>
+ <mkdir dir="${out.site.dir}/images"/>
<!-- Copy site-book.xml to book.xml for defining the web site content
and replacing token filters (year) -->
@@ -420,6 +409,11 @@
<copy file="${conf.dir}/version.txt"
tofile="${out.site.dir}/version.txt" filtering="on"/>
+ <!-- Copy the images -->
+ <copy todir="${out.site.dir}/images">
+ <fileset dir="${xdoc.dir}/images"/>
+ </copy>
+
<!-- Note that we do not copy the javadoc to the web site. This is
because the web site need to evolve independently of the javadoc
for a given version of Cactus. In other words, the javadoc on
@@ -432,7 +426,7 @@
<target name="site" depends="prepare-site">
<stylebook book="${xdoc.dir}/book.xml"
- skinDirectory="${skin.dir}/xml.apache.org"
+ skinDirectory="${skin.dir}/jakarta.apache.org"
targetDirectory="${out.site.dir}">
<classpath>
@@ -560,40 +554,6 @@
<!--
========================================================================
- Generate a zip file containing all external dependencies
- ========================================================================
- -->
- <target name="dependencies.22" depends="init" if="servlet22.jar.present">
-
- <mkdir dir="${out.lib.dir}/servlet22"/>
- <copy file="${servlet22.jar}" todir="${out.lib.dir}/servlet22"/>
-
- </target>
-
- <target name="dependencies.23" depends="init" if="servlet23.jar.present">
-
- <mkdir dir="${out.lib.dir}/servlet23"/>
- <copy file="${servlet23.jar}" todir="${out.lib.dir}/servlet23"/>
-
- </target>
-
- <target name="dependencies" depends="dependencies.22,dependencies.23">
-
- <mkdir dir="${out.lib.dir}"/>
-
- <!-- Copy jar files -->
- <copy file="${junit.jar}" todir="${out.lib.dir}"/>
- <copy file="${stylebook.jar}" todir="${out.lib.dir}"/>
- <copy file="${xerces.jar}" todir="${out.lib.dir}"/>
- <copy file="${xalan.jar}" todir="${out.lib.dir}"/>
- <copy file="${crimson.jar}" todir="${out.lib.dir}"/>
-
- <zip zipfile="${final.dependencies.name}" basedir="${out.lib.dir}"/>
-
- </target>
-
- <!--
- ========================================================================
Build all distributables and copies them to the dist.dir directory
========================================================================
-->
@@ -614,7 +574,7 @@
</ant>
</target>
- <target name="dist"
depends="clean,dist.22,dist.23,jar,sample,source,doc,site,dependencies">
+ <target name="dist" depends="clean,dist.22,dist.23,jar,sample,source,doc,site">
<mkdir dir="${dist.dir}"/>
@@ -622,8 +582,6 @@
<copy file="${final.src.name}" tofile="${dist.src.name}"/>
<copy file="${final.site.name}-${DSTAMP}.tar.gz"
tofile="${dist.site.name}-${DSTAMP}.tar.gz"/>
- <copy file="${final.dependencies.name}"
- tofile="${dist.dependencies.name}"/>
</target>
