Mercurial > hg > jdk9-shenandoah > nashorn
changeset 1343:becb3bb6a422
8130307: improve Nashorn Javadoc target
Summary: reduce dependence on ASM sources in testing, address command line length problem on Windows
Reviewed-by: hannesw, sundar
author | mhaupt |
---|---|
date | Thu, 02 Jul 2015 11:20:47 +0200 |
parents | 6eca661ddf79 |
children | 9e67dbba8c3b |
files | make/build.xml |
diffstat | 1 files changed, 19 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/make/build.xml Thu Jul 02 11:09:20 2015 +0200 +++ b/make/build.xml Thu Jul 02 11:20:47 2015 +0200 @@ -208,10 +208,11 @@ </jar> </target> + <!-- generate javadoc for all Nashorn and ASM classes --> <target name="javadoc" depends="jar"> <javadoc destdir="${dist.javadoc.dir}" use="yes" overview="${src.dir}/overview.html" extdirs="${nashorn.ext.path}" windowtitle="${nashorn.product.name} ${nashorn.version}" - additionalparam="-quiet" failonerror="true"> + additionalparam="-quiet" failonerror="true" useexternalfile="true"> <classpath> <pathelement location="${build.classes.dir}"/> </classpath> @@ -225,10 +226,24 @@ </javadoc> </target> + <!-- generate javadoc for Nashorn classes --> + <target name="javadocnh" depends="jar"> + <javadoc destdir="${dist.javadoc.dir}" use="yes" overview="${src.dir}/overview.html" + extdirs="${nashorn.ext.path}" windowtitle="${nashorn.product.name} ${nashorn.version}" + additionalparam="-quiet" failonerror="true" useexternalfile="true"> + <classpath> + <pathelement location="${build.classes.dir}"/> + </classpath> + <fileset dir="${src.dir}" includes="**/*.java"/> + <link href="http://docs.oracle.com/javase/8/docs/api/"/> + </javadoc> + </target> + <!-- generate javadoc only for nashorn extension api classes --> <target name="javadocapi" depends="jar"> - <javadoc destdir="${dist.javadoc.dir}" use="yes" extdirs="${nashorn.ext.path}" - windowtitle="${nashorn.product.name}" additionalparam="-quiet" failonerror="true"> + <javadoc destdir="${dist.javadoc.dir}" use="yes" overview="${src.dir}/overview.html" + extdirs="${nashorn.ext.path}" windowtitle="${nashorn.product.name} ${nashorn.version}" + additionalparam="-quiet" failonerror="true" useexternalfile="true"> <classpath> <pathelement location="${build.classes.dir}"/> </classpath> @@ -469,7 +484,7 @@ </testng> </target> - <target name="test" depends="get-testng, javadoc, test-pessimistic, test-optimistic"/> + <target name="test" depends="get-testng, javadocnh, test-pessimistic, test-optimistic"/> <target name="test-optimistic" depends="jar, -test-classes-all,-test-classes-single, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available"> <echo message="Running test suite in OPTIMISTIC mode..."/>