jvanzyl 01/09/14 11:15:30
Modified: . build-docs.xml build.properties build.xml
Log:
- building up a classpath for the doc generation and making the
error message a little more accurate w.r.t doc generation errors.
- getting rid of some of the inter-repo deps by not including docs
for particular packages. we can simply make links to them or include
them from released distributions.
Revision Changes Path
1.2 +21 -24 jakarta-turbine-tdk/build-docs.xml
Index: build-docs.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build-docs.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-docs.xml 2001/09/12 18:52:18 1.1
+++ build-docs.xml 2001/09/14 18:15:30 1.2
@@ -4,22 +4,35 @@
<property file="${user.home}/build.properties" />
<property file="build.properties" />
-
+
+ <path id="classpath">
+ <pathelement location="${velocity.jar}"/>
+ <pathelement location="${jdom.jar}"/>
+ <pathelement location="${xerces.jar}"/>
+ </path>
+
<target name="init-tasks">
<available property="jdom.present" classname="org.jdom.JDOMException">
- <classpath path="${java.class.path}"/>
+ <classpath refid="classpath"/>
</available>
</target>
<target name="docs-prepare-error" depends="init-tasks" unless="jdom.present">
-
<echo>
- The Jakarta-Site2 module is not present! Please check
- to make sure that you have checked it out from CVS.
-
+ In order to generate the documentation you must have the following
+ properties set:
+
+ velocity.jar = ${velocity.jar}
+ jdom.jar = ${jdom.jar}
+ xerces.jar = ${xerces.jar}
+
+ Anakia is a Velocity tool which requires JDOM and JDOM's default
+ parser is found in the Xerces package.
+
+ You must also have the jakarta-site2 module checked out.
+
<http://jakarta.apache.org/site/jakarta-site2.html>
</echo>
-
</target>
<target
@@ -31,6 +44,7 @@
<taskdef
name="anakia"
classname="org.apache.velocity.anakia.AnakiaTask">
+ <classpath refid="classpath"/>
</taskdef>
<mkdir dir="${tdk.site}"/>
@@ -66,29 +80,12 @@
</copy>
-->
- <!-- Copy documentation files from dependent modules -->
- <copy todir="${tdk.site}/ant-docs">
- <fileset dir="${ant.docs}"/>
- </copy>
-
- <copy todir="${tdk.site}/hypersonic-docs">
- <fileset dir="${hypersonic.docs}"/>
- </copy>
-
- <copy todir="${tdk.site}/servletapi-docs">
- <fileset dir="${servletapi.docs}"/>
- </copy>
-
<copy todir="${tdk.site}/turbine-docs/apidocs">
<fileset dir="${turbine.home}/docs/apidocs"/>
</copy>
<copy todir="${tdk.site}/turbine-docs">
<fileset dir="${turbine-site.docs}"/>
- </copy>
-
- <copy todir="${tdk.site}/velocity-docs">
- <fileset dir="${velocity.docs}"/>
</copy>
</target>
</project>
1.5 +1 -6 jakarta-turbine-tdk/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.properties 2001/09/14 17:53:53 1.4
+++ build.properties 2001/09/14 18:15:30 1.5
@@ -76,13 +76,7 @@
# or use release distributions instead of repos for
# the docs.
-hypersonic.home = ../hypersonic
-velocity.home = ../jakarta-velocity
-velocity.docs = ${velocity.home}/docs
-servletapi.home = ../jakarta-servletapi-4
site2.home = ../jakarta-site2
-hypersonic.docs = ${hypersonic.home}/doc
-hypersonic.lib = ${hypersonic.home}/demo
# -------------------------------------------------------------------
# J A R S
@@ -137,3 +131,4 @@
mysql.jar = ${lib.repo}/mm.mysql-2.0.4.jar
postgresql.jar = ${lib.repo}/postgresql.jar
sapdbc.jar = ${lib.repo}/sapdbc.jar
+jdom.jar = ${lib.repo}/jdom-b7.jar
1.8 +0 -1 jakarta-turbine-tdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 2001/09/12 19:51:29 1.7
+++ build.xml 2001/09/14 18:15:30 1.8
@@ -11,7 +11,6 @@
<!-- ================================================================== -->
<target name="env">
-
<echo message="build.compiler = ${build.compiler}"/>
<echo message="java.class.path = ${java.class.path}"/>
<echo message="java.home = ${java.home}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
