hammant 2002/07/30 16:15:00
Modified: containerkit build.xml default.properties
Log:
docs included in dist
Revision Changes Path
1.9 +11 -51 jakarta-avalon-excalibur/containerkit/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/containerkit/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 6 Jul 2002 05:44:25 -0000 1.8
+++ build.xml 30 Jul 2002 23:15:00 -0000 1.9
@@ -297,8 +297,8 @@
<!-- Creates the distribution -->
<target name="dist"
- depends="dist-jar, test-reports, checkstyle-report, javadocs"
- description="Generates a distribution (jar + javadocs + unit tests +
checkstyle reports)">
+ depends="dist-jar, test-reports, checkstyle-report, site"
+ description="Generates a distribution (jar + docs + javadocs + unit tests +
checkstyle reports)">
<copy file="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
<copy file="../KEYS" todir="${dist.dir}"/>
@@ -312,6 +312,7 @@
<zip zipfile="${dist.base}/${dist.name}.zip" compress="true">
<zipfileset dir="${dist.dir}" prefix="${dist.name}"/>
+ <zipfileset dir="${docs.dir}" prefix="${dist.name}/docs"/>
</zip>
<delete dir="${dist.dir}" />
@@ -367,58 +368,17 @@
<!-- Prepares the documentation directory -->
- <target name="docs" depends="setup-filters"> <!-- depends="javadocs"
description="Generates the Docs" -->
- <mkdir dir="${docs.dir}"/>
+ <target name="docs" depends="setup-filters" description="Generates the Docs">
+ <ant antfile="${basedir}/../cocoonbuild.xml"/>
- <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>
-
- <copy todir="${build.context}/xdocs" filtering="on" overwrite="yes">
- <fileset dir="${xdocs.dir}"/>
- </copy>
-
- <copy todir="${build.context}/resources" filtering="off" overwrite="yes">
- <fileset dir="${context.dir}/resources"/>
- <fileset dir="${xdocs.dir}">
- <include name="**/images/**"/>
- </fileset>
- </copy>
-
- <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}/${dir-name}.uris"/>
- <classpath>
- <path refid="tools.class.path"/>
- <fileset dir="${tools.dir}/ext"/>
- </classpath>
- </java>
-
- <copy todir="${docs.dir}">
- <fileset dir="${build.docs}">
- <include name="**"/>
- </fileset>
- </copy>
-
- <!-- hack for stupid transport on api link -->
- <replace file="${docs.dir}/index.html" token="index.html.xml"
value="index.html"/>
+ <copy todir="${docs.dir}">
+ <fileset dir="${build.docs}">
+ <include name="**"/>
+ </fileset>
+ </copy>
</target>
-
+
<target name="site" depends="javadocs, docs" description=" Places Docs ready
for hosting on website">
<mkdir dir="../site/dist/docs/${dir-name}"/>
1.3 +10 -1 jakarta-avalon-excalibur/containerkit/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/containerkit/default.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.properties 11 Jun 2002 00:11:22 -0000 1.2
+++ default.properties 30 Jul 2002 23:15:00 -0000 1.3
@@ -53,9 +53,18 @@
conf.dir = ${src.dir}/conf
test.dir = ${src.dir}/test
+# needed by Cocoon
+build.context = ${build.dir}/documentation
+build.docs = ${build.dir}/docs
+build.xdocs = ${build.dir}/xdocs
+context.dir = ../../jakarta-avalon/src/documentation
+tools.dir = ../../jakarta-avalon/tools
+tools.jar = ${java.home}/../lib/tools.jar
+docs.dir = docs
+
# Set the properties for distribution directories
dist.dir = dist
-dist.javadocs = ${dist.dir}/docs/api
+dist.javadocs = ${docs.dir}/api
# name of .zip/.tar.gz/.bz2 files and their top-level directory
dist.name = ${name}-${version}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
