hammant 2002/06/06 08:52:55
Modified: ftpserver build.xml
Log:
dist now includes docs.
Revision Changes Path
1.35 +85 -55 jakarta-avalon-apps/ftpserver/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/ftpserver/build.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- build.xml 4 Jun 2002 09:04:30 -0000 1.34
+++ build.xml 6 Jun 2002 15:52:55 -0000 1.35
@@ -31,7 +31,7 @@
<property name="build.javadocs" value="${build.dir}/javadocs"/>
<property name="build.docs" value="${build.dir}/docs"/>
<property name="build.context" value="${build.dir}/documentation"/>
- <property name="build.xdocs" value="${build.context}/xdocs"/>
+ <property name="build.xdocs" value="${build.context}/content/xdocs"/>
<!-- Set the properties for source directories -->
<property name="src.dir" value="src"/>
@@ -41,7 +41,7 @@
<property name="docs.dir" value="docs"/>
<property name="context.dir"
value="../../jakarta-avalon/src/documentation"/>
<property name="xdocs.dir" value="${src.dir}/xdocs"/>
- <property name="tools.dir" value="../../jakarta-avalon/tools"/>
+ <property name="tools.dir" location="../../jakarta-avalon/tools"/>
<property name="dist.name" value="${Name}-${version}"/>
<property name="dist.base" value="distributions"/>
@@ -136,8 +136,12 @@
</target>
+ <target name="test-xdoclet">
+ <available classname="xdoclet.XDocletMain"
classpathref="project.class.path" property="xdoclet.present"/>
+ </target>
+
<!-- Make .xinfo and manifest automatically for blocks -->
- <target name="phoenix-xdoclet" depends="compile">
+ <target name="phoenix-xdoclet" depends="compile" if="xdoclet.present">
<mkdir dir="${build.xdoclet}"/>
@@ -154,13 +158,21 @@
<blockinfo/>
<manifest manifestFile="manifest.mf" />
</phoenix-blocks>
-
</target>
+ <!-- Make .xinfo and manifest automatically for blocks -->
+ <target name="no-phoenix-xdoclet" depends="compile"
unless="xdoclet.present">
+
+ <mkdir dir="${build.xdoclet}"/>
+
+ <unzip src="${src.dir}/generated-by-xdoclet.zip" dest="${build.xdoclet}"
/>
+
+ </target>
+
<!-- Jars up project -->
- <target name="jars" depends="phoenix-xdoclet">
+ <target name="jars" depends="test-xdoclet, phoenix-xdoclet,
no-phoenix-xdoclet">
<mkdir dir="${build.lib}"/>
@@ -250,55 +262,74 @@
<echo message="Printer friendly docs are not yet implemented"/>
</target>
- <!-- Prepares the documentation directory -->
- <target name="docs" depends="setup-filters, javadocs"
description="Generates the Docs">
- <mkdir dir="${docs.dir}"/>
-
- <mkdir dir="${build.context}"/>
- <mkdir dir="${build.xdocs}"/>
- <mkdir dir="${build.docs}"/>
- <mkdir dir="${build.dir}/work"/>
-
- <!-- Base pointers for non-xdocs documentation. Override these in
.ant.properties to link to local docs -->
- <copy todir="${build.context}" filtering="on">
- <fileset dir="${context.dir}">
- <exclude name="diagrams/**"/>
- <exclude name="resources/**"/>
- <exclude name="xdocs"/>
- </fileset>
- </copy>
+ <!-- Prepares the documentation directory -->
+ <target name="docs" depends="html-docs, javadocs" description="generates
all the Avalon documentation"/>
- <copy todir="${build.context}/xdocs" filtering="on" overwrite="yes">
- <fileset dir="${xdocs.dir}"/>
- </copy>
+
+ <target name="html-docs" depends="setup-filters" description="generates
the xdocs-based documentation">
- <copy todir="${build.context}/resources" filtering="off" overwrite="yes">
- <fileset dir="${context.dir}/resources"/>
- <fileset dir="${xdocs.dir}">
- <include name="**/images/**"/>
- </fileset>
- </copy>
+ <property name="use.skin" value="avalon-site"/>
- <java classname="org.apache.cocoon.Main" fork="true">
- <arg value="-c${build.context}/"/>
- <arg value="-d${build.docs}"/>
- <arg value="-w${build.dir}/work"/>
- <arg value="-l${build.dir}/work/cocoon.log"/>
- <arg value="-uINFO"/>
- <arg value="-f${xdocs.dir}/ftpserver.uris"/>
- <classpath>
- <path refid="tools.class.path"/>
- <fileset dir="${tools.dir}/ext"/>
- </classpath>
- </java>
+ <!-- Skin filters -->
+ <filter token="skin" value="${use.skin}"/>
+ <filter token="link1" value="apache"/>
+ <filter token="link1.href" value="http://www.apache.org"/>
+ <filter token="link2" value="jakarta"/>
+ <filter token="link2.href" value="http://jakarta.apache.org"/>
+ <filter token="link3" value="avalon"/>
+ <filter token="link3.href"
value="http://jakarta.apache.org/avalon/"/>
+ <filter token="group-logo.src" value="images/jakarta-logo.gif"/>
+ <filter token="group-logo.href" value="http://jakarta.apache.org/"/>
+ <filter token="project-logo.src" value="images/header.gif"/>
+ <filter token="project-logo.href"
value="http://jakarta.apache.org/avalon/"/>
+ <filter token="year" value="2002"/>
+ <filter token="vendor" value="Apache Software Foundation"/>
+
+ <mkdir dir="${build.context}"/>
+ <mkdir dir="${build.docs}"/>
+ <mkdir dir="${build.xdocs}"/>
+ <mkdir dir="${build.dir}/work"/>
+
+ <copy todir="${build.context}" overwrite="true" filtering="on">
+ <fileset dir="${context.dir}">
+ <exclude name="**/*.gif"/>
+ <exclude name="**/*.jpg"/>
+ <exclude name="**/*.png"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${build.context}" filtering="off">
+ <fileset dir="${context.dir}">
+ <include name="**/*.gif"/>
+ <include name="**/*.jpg"/>
+ <include name="**/*.png"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.xdocs}" filtering="on" overwrite="true">
+ <fileset dir="${xdocs.dir}"/>
+ </copy>
+
+ <echo
message="-------------------------------------------------------------"/>
+ <echo message=" Building docs, please stand by ..."/>
+
+ <java classname="org.apache.cocoon.Main" fork="true"
maxmemory="128m" failonerror="true">
+ <arg value="-c${build.context}/"/>
+ <arg value="-d${build.docs}"/>
+ <arg value="-w${build.dir}/work"/>
+ <arg value="-l${build.dir}/work/cocoon.log"/>
+ <arg value="-uWARN"/>
+ <arg value="index.html"/>
+ <classpath>
+ <path refid="tools.class.path"/>
+ <fileset dir="${tools.dir}/ext"/>
+ </classpath>
+ </java>
- <copy todir="docs">
- <fileset dir="${build.docs}">
- <include name="**"/>
- </fileset>
- </copy>
- </target>
+ <echo message=" ...docs generated succesfully in ./build/docs dir."/>
+ <echo
message="-------------------------------------------------------------"/>
+
+ </target>
<target name="site" depends="docs" description=" Places Docs ready for
hosting on website">
@@ -349,9 +380,6 @@
<include name="common/lib/avalon-*"/>
<include name="common/lib/cornerstone.jar"/>
<include name="common/lib/phoenix-*"/>
- <include name="common/lib/xdoclet*"/>
- <include name="common/lib/xjavadoc*"/>
- <include name="common/lib/log4j-core*"/>
</fileset>
</zip>
@@ -367,9 +395,6 @@
<include name="common/lib/avalon-*"/>
<include name="common/lib/cornerstone.jar"/>
<include name="common/lib/phoenix-*"/>
- <include name="common/lib/xdoclet*"/>
- <include name="common/lib/xjavadoc*"/>
- <include name="common/lib/log4j-core*"/>
</tarfileset>
</tar>
@@ -392,6 +417,7 @@
<mkdir dir="${bin.dist.docs}"/>
<copy todir="${bin.dist.docs}">
<fileset dir="${docs.dir}"/>
+ <fileset dir="${build.docs}"/>
</copy>
<!-- Not allowed to distribute glue thus no soapdemo jar -->
@@ -411,11 +437,15 @@
<copy todir="${src.dist.docs}">
<fileset dir="${docs.dir}"/>
+ <fileset dir="${build.docs}"/>
</copy>
<copy todir="${src.dist.src}">
<fileset dir="${src.dir}"/>
</copy>
+
+ <zip zipfile="${src.dist.src}/generated-by-xdoclet.zip"
+ basedir="${build.xdoclet}"/>
<copy todir="${src.dist.dir}">
<fileset dir=".">
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
