cziegeler 2003/01/07 05:59:43
Modified: . build.xml
Log:
First cleanup: javadoc generation
Revision Changes Path
1.302 +67 -71 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- build.xml 7 Jan 2003 13:36:56 -0000 1.301
+++ build.xml 7 Jan 2003 13:59:43 -0000 1.302
@@ -1020,9 +1020,6 @@
</fileset>
</copy>
</then>
- <else>
- <echo message="Excluding scratchpad"/>
- </else>
</if>
<mkdir dir="${build.deprecated.src}"/>
@@ -1820,79 +1817,78 @@
</target>
<!-- =================================================================== -->
- <!-- Creates the API documentation for pre JDK 1.4 -->
- <!-- =================================================================== -->
- <target name="javadocs13" depends="init" unless="jdbc3.present">
- <javadoc packagenames="${packages}.*"
- destdir="${build.javadocs}"
- author="true"
- version="true"
- use="false"
- noindex="true"
- windowtitle="${Name} API (${version}, ${TODAY})"
- doctitle="${Name}"
- bottom="Copyright © ${year} Apache Software Foundation. All
Rights Reserved."
- stylesheetfile="${resource.dir}/javadoc.css"
- useexternalfile="yes">
-<!-- FIXME: Using this fileset technique fails with out-of-memory errors.
- It seems that the cause is loading too many individual *.java files.
- Try <sourcepath> instead and let javadoc load them. -->
-<!--
- <fileset dir="${build.dir}">
- <include name="src/**/*.java"/>
- <include name="blocks/**/*.java"/>
- <include name="deprecated/**/*.java"/>
- </fileset>
- <fileset dir="${blocks.dir}">
- <include name="**/mocks/**/*.java"/>
- </fileset>
--->
- <sourcepath location="${build.dir}/src"/>
- <sourcepath location="${build.dir}/blocks"/>
- <fileset dir="${blocks.dir}">
- <include name="**/mocks/**/*.java"/>
- </fileset>
- <classpath refid="classpath"/>
- </javadoc>
- </target>
-
- <!-- =================================================================== -->
- <!-- Creates the API documentation for JDK 1.4 -->
- <!-- =================================================================== -->
- <target name="javadocs14" depends="init" if="jdbc3.present">
- <javadoc packagenames="${packages}.*"
- additionalparam="-subpackages ${packages}"
-
excludepackagenames="org.apache.cocoon.components.language.programming.java"
- destdir="${build.javadocs}"
- author="true"
- version="true"
- use="false"
- noindex="true"
- windowtitle="${Name} API (${version}, ${TODAY})"
- doctitle="${Name}"
- bottom="Copyright © ${year} Apache Software Foundation. All
Rights Reserved."
- stylesheetfile="${resource.dir}/javadoc.css"
- useexternalfile="yes">
- <fileset dir="${build.dir}">
- <include name="src/**/*.java"/>
- <include name="blocks/**/*.java"/>
- <include name="deprecated/**/*.java"/>
- </fileset>
- <fileset dir="${blocks.dir}">
- <include name="**/mocks/**/*.java"/>
- </fileset>
- <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" inheritAll="true" inheritRefs="true"/>
- <antcall target="javadocs14" inheritAll="true" inheritRefs="true"/>
+
+ <!-- unfortunately we have to make a distinction between jdk 1.4 and before,
+ because jdk 1.4 cannot cope very well with package names containing 'java'
+ like in o.a.c.components.language.programming.java. -->
+ <if>
+ <equals arg1="1.4" arg2="${java.specification.version}"/>
+ <then>
+ <!-- Create the java docs for JDK 1.4 -->
+ <javadoc packagenames="${packages}.*"
+ additionalparam="-subpackages ${packages}"
+
excludepackagenames="org.apache.cocoon.components.language.programming.java"
+ destdir="${build.javadocs}"
+ author="true"
+ version="true"
+ use="false"
+ noindex="true"
+ windowtitle="${Name} API (${version}, ${TODAY})"
+ doctitle="${Name}"
+ bottom="Copyright © ${year} Apache Software Foundation. All
Rights Reserved."
+ stylesheetfile="${resource.dir}/javadoc.css"
+ useexternalfile="yes">
+ <fileset dir="${build.dir}">
+ <include name="src/**/*.java"/>
+ <include name="blocks/**/*.java"/>
+ <include name="deprecated/**/*.java"/>
+ </fileset>
+ <fileset dir="${blocks.dir}">
+ <include name="**/mocks/**/*.java"/>
+ </fileset>
+ <classpath refid="classpath"/>
+ </javadoc>
+ </then>
+ <else>
+ <!-- Create the java docs for pre 1.4 -->
+ <javadoc packagenames="${packages}.*"
+ destdir="${build.javadocs}"
+ author="true"
+ version="true"
+ use="false"
+ noindex="true"
+ windowtitle="${Name} API (${version}, ${TODAY})"
+ doctitle="${Name}"
+ bottom="Copyright © ${year} Apache Software Foundation. All
Rights Reserved."
+ stylesheetfile="${resource.dir}/javadoc.css"
+ useexternalfile="yes">
+ <!-- FIXME: Using this fileset technique fails with out-of-memory errors.
+ It seems that the cause is loading too many individual *.java files.
+ Try <sourcepath> instead and let javadoc load them. -->
+ <!--
+ <fileset dir="${build.dir}">
+ <include name="src/**/*.java"/>
+ <include name="blocks/**/*.java"/>
+ <include name="deprecated/**/*.java"/>
+ </fileset>
+ <fileset dir="${blocks.dir}">
+ <include name="**/mocks/**/*.java"/>
+ </fileset>
+ -->
+ <sourcepath location="${build.dir}/src"/>
+ <sourcepath location="${build.dir}/blocks"/>
+ <fileset dir="${blocks.dir}">
+ <include name="**/mocks/**/*.java"/>
+ </fileset>
+ <classpath refid="classpath"/>
+ </javadoc>
+ </else>
+ </if>
</target>
<!-- =================================================================== -->
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
