8130307: improve Nashorn Javadoc target

Wed, 29 Jul 2015 14:48:46 +0530

author
sundar
date
Wed, 29 Jul 2015 14:48:46 +0530
changeset 1509
533c66e9ad04
parent 1508
0c56e684d2c9
child 1510
5e3d8947e95c

8130307: improve Nashorn Javadoc target
Reviewed-by: attila, mhaupt

make/build.xml file | annotate | diff | comparison | revisions
     1.1 --- a/make/build.xml	Mon Jul 13 20:09:14 2015 +0530
     1.2 +++ b/make/build.xml	Wed Jul 29 14:48:46 2015 +0530
     1.3 @@ -209,10 +209,11 @@
     1.4      </jar>
     1.5    </target>
     1.6  
     1.7 +  <!-- generate javadoc for all Nashorn and ASM classes -->
     1.8    <target name="javadoc" depends="jar">
     1.9      <javadoc destdir="${dist.javadoc.dir}" use="yes" overview="${src.dir}/overview.html" 
    1.10          extdirs="${nashorn.ext.path}" windowtitle="${nashorn.product.name} ${nashorn.version}"
    1.11 -        additionalparam="-quiet" failonerror="true">
    1.12 +        additionalparam="-quiet" failonerror="true" useexternalfile="true">
    1.13        <classpath>
    1.14          <pathelement location="${build.classes.dir}"/>
    1.15        </classpath>
    1.16 @@ -226,10 +227,23 @@
    1.17      </javadoc>
    1.18    </target>
    1.19  
    1.20 +  <!-- generate javadoc for Nashorn classes -->
    1.21 +  <target name="javadocnh" depends="jar">
    1.22 +    <javadoc destdir="${dist.javadoc.dir}" use="yes" overview="${src.dir}/overview.html"
    1.23 +        extdirs="${nashorn.ext.path}" windowtitle="${nashorn.product.name} ${nashorn.version}"
    1.24 +        additionalparam="-quiet" failonerror="true" useexternalfile="true">
    1.25 +      <classpath>
    1.26 +        <pathelement location="${build.classes.dir}"/>
    1.27 +      </classpath>
    1.28 +      <fileset dir="${src.dir}" includes="**/*.java"/>
    1.29 +      <link href="http://docs.oracle.com/javase/8/docs/api/"/>
    1.30 +    </javadoc>
    1.31 +  </target>
    1.32 +
    1.33    <!-- generate javadoc only for nashorn extension api classes -->
    1.34    <target name="javadocapi" depends="jar">
    1.35      <javadoc destdir="${dist.javadoc.dir}" use="yes" extdirs="${nashorn.ext.path}" 
    1.36 -        windowtitle="${nashorn.product.name}" additionalparam="-quiet" failonerror="true">
    1.37 +        windowtitle="${nashorn.product.name}" additionalparam="-quiet" failonerror="true" useexternalfile="true">
    1.38        <classpath>
    1.39          <pathelement location="${build.classes.dir}"/>
    1.40        </classpath>
    1.41 @@ -238,7 +252,6 @@
    1.42      </javadoc>
    1.43    </target>
    1.44  
    1.45 -
    1.46    <!-- generate shell.html for shell tool documentation -->
    1.47    <target name="shelldoc" depends="jar">
    1.48      <java classname="${nashorn.shell.tool}" dir="${basedir}" output="${dist.dir}/shell.html" failonerror="true" fork="true">
    1.49 @@ -460,7 +473,7 @@
    1.50      </testng>
    1.51    </target>
    1.52  
    1.53 -  <target name="test" depends="get-testng, javadoc, test-pessimistic, test-optimistic"/>
    1.54 +  <target name="test" depends="get-testng, javadocnh, test-pessimistic, test-optimistic"/>
    1.55  
    1.56    <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">
    1.57      <echo message="Running test suite in OPTIMISTIC mode..."/>

mercurial