cziegeler 2002/06/07 04:10:09
Modified: . build.xml
src/documentation/xdocs/faq index.xml
Removed: src/documentation/xdocs/faq faq-building.xml
Log:
Removed build faq again and fixed javadoc generation with jdk 1.4 by using a
workaround and conditional javadoc statements...
Revision Changes Path
1.229 +34 -7 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- build.xml 6 Jun 2002 08:07:09 -0000 1.228
+++ build.xml 7 Jun 2002 11:10:09 -0000 1.229
@@ -203,7 +203,7 @@
<property name="images.dir" value="${src.dir}/documentation/images"/>
<property name="webapp.dir" value="${src.dir}/webapp"/>
<property name="resource.dir" value="${src.dir}/resources"/>
- <property name="packages" value="org.apache.*"/>
+ <property name="packages" value="org.apache"/>
<property name="context.dir" value="${src.dir}/documentation"/>
<property name="scratchpad.dir" value="${src.dir}/scratchpad"/>
@@ -1410,6 +1410,7 @@
<!-- Set a variable if javadoc is already up-to-date. -->
<!-- =================================================================== -->
<target name="javadocs_check">
+ <mkdir dir="${build.javadocs}"/>
<uptodate property="javadocs.notrequired"
targetfile="${build.javadocs}/packages.html" >
<srcfiles dir= "${build.src}" includes="**/*.java,**/package.html"/>
</uptodate>
@@ -1427,13 +1428,29 @@
</target>
<!-- =================================================================== -->
- <!-- Creates the API documentation -->
+ <!-- Creates the API documentation for pre JDK 1.4 -->
<!-- =================================================================== -->
- <target name="javadocs" depends="prepare-src-main, javadocs_check, javadocs_done"
- unless="javadocs.notrequired"
- description="Builds the API documentation (javadocs)">
- <mkdir dir="${build.javadocs}"/>
- <javadoc packagenames="${packages}"
+ <target name="javadocs13" unless="jdbc3.present">
+ <javadoc packagenames="${packages}.*"
+ sourcepath="${build.src}"
+ destdir="${build.javadocs}"
+ author="true"
+ version="true"
+ use="false"
+ noindex="true"
+ windowtitle="${Name} API"
+ doctitle="${Name}"
+ bottom="Copyright © ${year} Apache Software Foundation. All
Rights Reserved."
+ stylesheetfile="${resource.dir}/javadoc.css">
+ <classpath refid="classpath"/>
+ </javadoc>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Creates the API documentation for JDK 1.4 -->
+ <!-- =================================================================== -->
+ <target name="javadocs14" if="jdbc3.present">
+ <javadoc additionalparam="-subpackages ${packages}"
sourcepath="${build.src}"
destdir="${build.javadocs}"
author="true"
@@ -1446,6 +1463,16 @@
stylesheetfile="${resource.dir}/javadoc.css">
<classpath refid="classpath"/>
</javadoc>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Creates the API documentation -->
+ <!-- =================================================================== -->
+ <target name="javadocs" depends="prepare-src-main, javadocs_check, javadocs_done"
+ unless="javadocs.notrequired"
+ description="Builds the API documentation (javadocs)">
+ <antcall target="javadocs13"/>
+ <antcall target="javadocs14"/>
</target>
<!-- =================================================================== -->
1.6 +0 -1 xml-cocoon2/src/documentation/xdocs/faq/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/faq/index.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- index.xml 7 Jun 2002 10:45:22 -0000 1.5
+++ index.xml 7 Jun 2002 11:10:09 -0000 1.6
@@ -26,7 +26,6 @@
<ul>
<li><link href="faq-install.html">Installing Cocoon</link></li>
-<li><link href="faq-building.html">Building Cocoon</link></li>
<li><link href="faq-configure-environment.html">Configuring the Cocoon
Environment</link></li>
<li><link href="faq-cvs.html">CVS</link></li>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
