You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by vi...@apache.org on 2013/10/27 19:45:14 UTC
svn commit: r1536183 - /tomcat/tc7.0.x/trunk/build.xml
Author: violetagg
Date: Sun Oct 27 18:45:14 2013
New Revision: 1536183
URL: http://svn.apache.org/r1536183
Log:
Build javadoc with java 7
Modified:
tomcat/tc7.0.x/trunk/build.xml
Modified: tomcat/tc7.0.x/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1536183&r1=1536182&r2=1536183&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Sun Oct 27 18:45:14 2013
@@ -1681,6 +1681,8 @@ Apache Tomcat ${version} native binaries
<target name="javadoc" depends="dist-source,extras-webservices-prepare"
description="Create the Tomcat javadoc" >
+ <fail unless="java.7.home"
+ message="The java.7.home property must be set for javadoc build"/>
<javadoc packagenames="javax.servlet.*"
excludepackagenames="javax.servlet.jsp.*"
sourcepath="${tomcat.dist}/src/java"
@@ -1692,15 +1694,14 @@ Apache Tomcat ${version} native binaries
bottom="Copyright &#169; 2000-${year} Apache Software Foundation. All Rights Reserved."
encoding="ISO-8859-1"
additionalparam="-breakiterator"
- maxmemory="256m" >
+ maxmemory="256m"
+ executable="${java.7.home}/bin/javadoc">
<classpath>
<path refid="compile.classpath"/>
<path refid="tomcat.webservices.classpath"/>
<path location="${ant.core.lib}"/>
</classpath>
</javadoc>
- <patch-javadoc dir="${tomcat.dist}/webapps/docs/servletapi"
- docencoding="ISO-8859-1"/>
<javadoc packagenames="javax.servlet.jsp.*"
sourcepath="${tomcat.dist}/src/java"
destdir="${tomcat.dist}/webapps/docs/jspapi"
@@ -1711,15 +1712,14 @@ Apache Tomcat ${version} native binaries
bottom="Copyright &#169; 2000-${year} Apache Software Foundation. All Rights Reserved."
encoding="ISO-8859-1"
additionalparam="-breakiterator"
- maxmemory="256m" >
+ maxmemory="256m"
+ executable="${java.7.home}/bin/javadoc">
<classpath>
<path refid="compile.classpath"/>
<path refid="tomcat.webservices.classpath"/>
<path location="${ant.core.lib}"/>
</classpath>
</javadoc>
- <patch-javadoc dir="${tomcat.dist}/webapps/docs/jspapi"
- docencoding="ISO-8859-1"/>
<javadoc packagenames="javax.el.*"
sourcepath="${tomcat.dist}/src/java"
destdir="${tomcat.dist}/webapps/docs/elapi"
@@ -1730,15 +1730,14 @@ Apache Tomcat ${version} native binaries
bottom="Copyright &#169; 2000-${year} Apache Software Foundation. All Rights Reserved."
encoding="ISO-8859-1"
additionalparam="-breakiterator"
- maxmemory="256m" >
+ maxmemory="256m"
+ executable="${java.7.home}/bin/javadoc">
<classpath>
<path refid="compile.classpath"/>
<path refid="tomcat.webservices.classpath"/>
<path location="${ant.core.lib}"/>
</classpath>
</javadoc>
- <patch-javadoc dir="${tomcat.dist}/webapps/docs/elapi"
- docencoding="ISO-8859-1"/>
<javadoc packagenames="javax.websocket.*"
sourcepath="${tomcat.dist}/src/java"
destdir="${tomcat.dist}/webapps/docs/websocketapi"
@@ -1749,15 +1748,14 @@ Apache Tomcat ${version} native binaries
bottom="Copyright &#169; 2000-${year} Apache Software Foundation. All Rights Reserved."
encoding="ISO-8859-1"
additionalparam="-breakiterator"
- maxmemory="256m" >
+ maxmemory="256m"
+ executable="${java.7.home}/bin/javadoc">
<classpath>
<path refid="compile.classpath"/>
<path refid="tomcat.webservices.classpath"/>
<path location="${ant.core.lib}"/>
</classpath>
</javadoc>
- <patch-javadoc dir="${tomcat.dist}/webapps/docs/websocketapi"
- docencoding="ISO-8859-1"/>
<javadoc packagenames="org.apache.*"
destdir="${tomcat.dist}/webapps/docs/api"
version="true"
@@ -1767,7 +1765,8 @@ Apache Tomcat ${version} native binaries
bottom="Copyright &#169; 2000-${year} Apache Software Foundation. All Rights Reserved."
encoding="ISO-8859-1"
additionalparam="-breakiterator"
- maxmemory="256m" >
+ maxmemory="256m"
+ executable="${java.7.home}/bin/javadoc">
<classpath>
<path refid="compile.classpath"/>
<path refid="tomcat.webservices.classpath"/>
@@ -1786,8 +1785,6 @@ Apache Tomcat ${version} native binaries
<path location="${tomcat.dist}/src/modules/jdbc-pool/src/main/java"/>
</sourcepath>
</javadoc>
- <patch-javadoc dir="${tomcat.dist}/webapps/docs/api"
- docencoding="ISO-8859-1"/>
</target>
<!--
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org