8138643: nashorn ant build.xml javadoc, javadocapi targets are broken and netbeans makefile does not include shell sources
Reviewed-by: attila, hannesw
This commit is contained in:
Athijegannathan Sundararajan
parent
f3ff9a5c9a
commit
2b4de2f271
@ -219,13 +219,14 @@
|
||||
|
||||
<!-- 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"
|
||||
<javadoc destdir="${dist.javadoc.dir}" use="yes" overview="${nashorn.module.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"/>
|
||||
<fileset dir="${nashorn.module.src.dir}" includes="**/*.java"/>
|
||||
<fileset dir="${nashorn.shell.module.src.dir}" includes="**/*.java"/>
|
||||
<fileset dir="${jdk.asm.src.dir}" includes="**/*.java"/>
|
||||
<link href="http://docs.oracle.com/javase/8/docs/api/"/>
|
||||
<!-- The following tags are used only in ASM sources - just ignore these -->
|
||||
@ -251,13 +252,13 @@
|
||||
|
||||
<!-- generate javadoc only for nashorn extension api classes -->
|
||||
<target name="javadocapi" depends="jar">
|
||||
<javadoc destdir="${dist.javadoc.dir}" use="yes" overview="${src.dir}/overview.html"
|
||||
<javadoc destdir="${dist.javadoc.dir}" use="yes" overview="${nashorn.module.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="jdk/nashorn/api/**/*.java"/>
|
||||
<fileset dir="${nashorn.module.src.dir}" includes="jdk/nashorn/api/**/*.java"/>
|
||||
<link href="http://docs.oracle.com/javase/8/docs/api/"/>
|
||||
</javadoc>
|
||||
</target>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
@ -20,157 +20,175 @@
|
||||
Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
or visit www.oracle.com if you need additional information or have any
|
||||
questions.
|
||||
-->
|
||||
<project xmlns="http://www.netbeans.org/ns/project/1">
|
||||
<type>org.netbeans.modules.ant.freeform</type>
|
||||
<configuration>
|
||||
<general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
|
||||
<name>nashorn</name>
|
||||
</general-data>
|
||||
<general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
|
||||
<!-- Do not use Project Properties customizer when editing this file manually. -->
|
||||
<name>nashorn</name>
|
||||
<properties/>
|
||||
<folders>
|
||||
<source-folder>
|
||||
<label>nashorn</label>
|
||||
<location>.</location>
|
||||
<encoding>UTF-8</encoding>
|
||||
</source-folder>
|
||||
<source-folder>
|
||||
<label>../test/src</label>
|
||||
<location>../test/src</location>
|
||||
</source-folder>
|
||||
<source-folder>
|
||||
<label>../buildtools/nasgen/src</label>
|
||||
<location>../buildtools/nasgen/src</location>
|
||||
</source-folder>
|
||||
<source-folder>
|
||||
<label>../src/jdk.scripting.nashorn/share/classes</label>
|
||||
<location>../src/jdk.scripting.nashorn/share/classes</location>
|
||||
</source-folder>
|
||||
<source-folder>
|
||||
<label>../test/src</label>
|
||||
<type>java</type>
|
||||
<location>../test/src</location>
|
||||
<encoding>UTF-8</encoding>
|
||||
</source-folder>
|
||||
<source-folder>
|
||||
<label>../buildtools/nasgen/src</label>
|
||||
<type>java</type>
|
||||
<location>../buildtools/nasgen/src</location>
|
||||
<encoding>UTF-8</encoding>
|
||||
</source-folder>
|
||||
<source-folder>
|
||||
<label>../src/jdk.scripting.nashorn/share/classes</label>
|
||||
<type>java</type>
|
||||
<location>../src/jdk.scripting.nashorn/share/classes</location>
|
||||
<encoding>UTF-8</encoding>
|
||||
</source-folder>
|
||||
</folders>
|
||||
<ide-actions>
|
||||
<action name="build">
|
||||
<script>nbproject/nbjdk.xml</script>
|
||||
<target>jar</target>
|
||||
</action>
|
||||
<action name="clean">
|
||||
<script>nbproject/nbjdk.xml</script>
|
||||
<target>clean</target>
|
||||
</action>
|
||||
<action name="javadoc">
|
||||
<script>nbproject/nbjdk.xml</script>
|
||||
<target>javadoc</target>
|
||||
</action>
|
||||
<action name="test">
|
||||
<script>nbproject/nbjdk.xml</script>
|
||||
<target>test</target>
|
||||
</action>
|
||||
<action name="rebuild">
|
||||
<script>nbproject/nbjdk.xml</script>
|
||||
<target>clean</target>
|
||||
<target>jar</target>
|
||||
</action>
|
||||
<action name="run">
|
||||
<script>nbproject/nbjdk.xml</script>
|
||||
<target>run</target>
|
||||
</action>
|
||||
<action name="debug">
|
||||
<script>nbproject/nbjdk.xml</script>
|
||||
<target>debug-nb</target>
|
||||
</action>
|
||||
<action name="run.single">
|
||||
<script>build.xml</script>
|
||||
<target>test</target>
|
||||
<context>
|
||||
<property>test.class</property>
|
||||
<folder>../test/src</folder>
|
||||
<pattern>\.java$</pattern>
|
||||
<format>relative-path-noext</format>
|
||||
<arity>
|
||||
<one-file-only/>
|
||||
</arity>
|
||||
</context>
|
||||
</action>
|
||||
<action name="debug.single">
|
||||
<script>nbproject/ide-file-targets.xml</script>
|
||||
<target>debug-selected-file-in-src</target>
|
||||
<context>
|
||||
<property>test.class</property>
|
||||
<folder>../test/src</folder>
|
||||
<pattern>\.java$</pattern>
|
||||
<format>relative-path-noext</format>
|
||||
<arity>
|
||||
<one-file-only/>
|
||||
</arity>
|
||||
</context>
|
||||
</action>
|
||||
</ide-actions>
|
||||
<view>
|
||||
<items>
|
||||
<source-folder style="packages">
|
||||
<label>../test/src</label>
|
||||
<location>../test/src</location>
|
||||
</source-folder>
|
||||
<source-folder style="packages">
|
||||
<label>../buildtools/nasgen/src</label>
|
||||
<location>../buildtools/nasgen/src</location>
|
||||
</source-folder>
|
||||
<source-folder style="packages">
|
||||
<label>../src/jdk.scripting.nashorn/share/classes</label>
|
||||
<location>../src/jdk.scripting.nashorn/share/classes</location>
|
||||
</source-folder>
|
||||
<source-file>
|
||||
<location>build.xml</location>
|
||||
</source-file>
|
||||
</items>
|
||||
<context-menu>
|
||||
<ide-action name="build"/>
|
||||
<ide-action name="rebuild"/>
|
||||
<ide-action name="clean"/>
|
||||
<ide-action name="javadoc"/>
|
||||
<ide-action name="run"/>
|
||||
<ide-action name="test"/>
|
||||
<ide-action name="debug"/>
|
||||
</context-menu>
|
||||
</view>
|
||||
<subprojects/>
|
||||
</general-data>
|
||||
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/4">
|
||||
<compilation-unit>
|
||||
<package-root>../test/src</package-root>
|
||||
<unit-tests/>
|
||||
<classpath mode="compile">../test/lib/testng.jar:../build/classes:../src/jdk.scripting.nashorn/share/classes</classpath>
|
||||
<source-level>1.8</source-level>
|
||||
</compilation-unit>
|
||||
<compilation-unit>
|
||||
<package-root>../buildtools/nasgen/src</package-root>
|
||||
<classpath mode="compile">../build/classes:../src</classpath>
|
||||
<source-level>1.8</source-level>
|
||||
</compilation-unit>
|
||||
<compilation-unit>
|
||||
<package-root>../src/jdk.scripting.nashorn/share/classes</package-root>
|
||||
<source-level>1.8</source-level>
|
||||
</compilation-unit>
|
||||
</java-data>
|
||||
</configuration>
|
||||
</project>
|
||||
-->
|
||||
<project xmlns="http://www.netbeans.org/ns/project/1">
|
||||
<type>org.netbeans.modules.ant.freeform</type>
|
||||
<configuration>
|
||||
<general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
|
||||
<name>nashorn</name>
|
||||
</general-data>
|
||||
<general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
|
||||
<!-- Do not use Project Properties customizer when editing this file manually. -->
|
||||
<name>nashorn</name>
|
||||
<properties/>
|
||||
<folders>
|
||||
<source-folder>
|
||||
<label>nashorn</label>
|
||||
<location>.</location>
|
||||
<encoding>UTF-8</encoding>
|
||||
</source-folder>
|
||||
<source-folder>
|
||||
<label>../test/src</label>
|
||||
<location>../test/src</location>
|
||||
</source-folder>
|
||||
<source-folder>
|
||||
<label>../buildtools/nasgen/src</label>
|
||||
<location>../buildtools/nasgen/src</location>
|
||||
</source-folder>
|
||||
<source-folder>
|
||||
<label>../src/jdk.scripting.nashorn/share/classes</label>
|
||||
<location>../src/jdk.scripting.nashorn/share/classes</location>
|
||||
</source-folder>
|
||||
<source-folder>
|
||||
<label>../test/src</label>
|
||||
<type>java</type>
|
||||
<location>../test/src</location>
|
||||
<encoding>UTF-8</encoding>
|
||||
</source-folder>
|
||||
<source-folder>
|
||||
<label>../buildtools/nasgen/src</label>
|
||||
<type>java</type>
|
||||
<location>../buildtools/nasgen/src</location>
|
||||
<encoding>UTF-8</encoding>
|
||||
</source-folder>
|
||||
<source-folder>
|
||||
<label>../src/jdk.scripting.nashorn/share/classes</label>
|
||||
<type>java</type>
|
||||
<location>../src/jdk.scripting.nashorn/share/classes</location>
|
||||
<encoding>UTF-8</encoding>
|
||||
</source-folder>
|
||||
<source-folder>
|
||||
<label>../src/jdk.scripting.nashorn.shell/share/classes</label>
|
||||
<type>java</type>
|
||||
<location>../src/jdk.scripting.nashorn.shell/share/classes</location>
|
||||
<encoding>UTF-8</encoding>
|
||||
</source-folder>
|
||||
<source-folder>
|
||||
<label>../src/jdk.scripting.nashorn.shell/share/classes</label>
|
||||
<location>../src/jdk.scripting.nashorn.shell/share/classes</location>
|
||||
</source-folder>
|
||||
</folders>
|
||||
<ide-actions>
|
||||
<action name="build">
|
||||
<script>nbproject/nbjdk.xml</script>
|
||||
<target>jar</target>
|
||||
</action>
|
||||
<action name="clean">
|
||||
<script>nbproject/nbjdk.xml</script>
|
||||
<target>clean</target>
|
||||
</action>
|
||||
<action name="javadoc">
|
||||
<script>nbproject/nbjdk.xml</script>
|
||||
<target>javadoc</target>
|
||||
</action>
|
||||
<action name="test">
|
||||
<script>nbproject/nbjdk.xml</script>
|
||||
<target>test</target>
|
||||
</action>
|
||||
<action name="rebuild">
|
||||
<script>nbproject/nbjdk.xml</script>
|
||||
<target>clean</target>
|
||||
<target>jar</target>
|
||||
</action>
|
||||
<action name="run">
|
||||
<script>nbproject/nbjdk.xml</script>
|
||||
<target>run</target>
|
||||
</action>
|
||||
<action name="debug">
|
||||
<script>nbproject/nbjdk.xml</script>
|
||||
<target>debug-nb</target>
|
||||
</action>
|
||||
<action name="run.single">
|
||||
<script>build.xml</script>
|
||||
<target>test</target>
|
||||
<context>
|
||||
<property>test.class</property>
|
||||
<folder>../test/src</folder>
|
||||
<pattern>\.java$</pattern>
|
||||
<format>relative-path-noext</format>
|
||||
<arity>
|
||||
<one-file-only/>
|
||||
</arity>
|
||||
</context>
|
||||
</action>
|
||||
<action name="debug.single">
|
||||
<script>nbproject/ide-file-targets.xml</script>
|
||||
<target>debug-selected-file-in-src</target>
|
||||
<context>
|
||||
<property>test.class</property>
|
||||
<folder>../test/src</folder>
|
||||
<pattern>\.java$</pattern>
|
||||
<format>relative-path-noext</format>
|
||||
<arity>
|
||||
<one-file-only/>
|
||||
</arity>
|
||||
</context>
|
||||
</action>
|
||||
</ide-actions>
|
||||
<view>
|
||||
<items>
|
||||
<source-folder style="packages">
|
||||
<label>../test/src</label>
|
||||
<location>../test/src</location>
|
||||
</source-folder>
|
||||
<source-folder style="packages">
|
||||
<label>../buildtools/nasgen/src</label>
|
||||
<location>../buildtools/nasgen/src</location>
|
||||
</source-folder>
|
||||
<source-folder style="packages">
|
||||
<label>../src/jdk.scripting.nashorn/share/classes</label>
|
||||
<location>../src/jdk.scripting.nashorn/share/classes</location>
|
||||
</source-folder>
|
||||
<source-folder style="packages">
|
||||
<label>../src/jdk.scripting.nashorn.shell/share/classes</label>
|
||||
<location>../src/jdk.scripting.nashorn.shell/share/classes</location>
|
||||
</source-folder>
|
||||
<source-file>
|
||||
<location>build.xml</location>
|
||||
</source-file>
|
||||
</items>
|
||||
<context-menu>
|
||||
<ide-action name="build"/>
|
||||
<ide-action name="rebuild"/>
|
||||
<ide-action name="clean"/>
|
||||
<ide-action name="javadoc"/>
|
||||
<ide-action name="run"/>
|
||||
<ide-action name="test"/>
|
||||
<ide-action name="debug"/>
|
||||
</context-menu>
|
||||
</view>
|
||||
<subprojects/>
|
||||
</general-data>
|
||||
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/4">
|
||||
<compilation-unit>
|
||||
<package-root>../test/src</package-root>
|
||||
<unit-tests/>
|
||||
<classpath mode="compile">../test/lib/testng.jar:../build/classes:../src/jdk.scripting.nashorn/share/classes</classpath>
|
||||
<source-level>1.8</source-level>
|
||||
</compilation-unit>
|
||||
<compilation-unit>
|
||||
<package-root>../buildtools/nasgen/src</package-root>
|
||||
<classpath mode="compile">../build/classes:../src</classpath>
|
||||
<source-level>1.8</source-level>
|
||||
</compilation-unit>
|
||||
<compilation-unit>
|
||||
<package-root>../src/jdk.scripting.nashorn/share/classes</package-root>
|
||||
<source-level>1.8</source-level>
|
||||
</compilation-unit>
|
||||
<compilation-unit>
|
||||
<package-root>../src/jdk.scripting.nashorn.shell/share/classes</package-root>
|
||||
<source-level>1.8</source-level>
|
||||
</compilation-unit>
|
||||
</java-data>
|
||||
</configuration>
|
||||
</project>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user