jdk-sandbox: comparison make/nashorn/build.xml

equal deleted inserted replaced

-:71c04702a3d5
+:72e3ae9a25eb
 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 name="nashorn" default="test" basedir="..">
+<project name="nashorn" default="test" basedir="../..">
 <import file="build-nasgen.xml"/>
 <import file="code_coverage.xml"/>
 <target name="load-properties">
 <!-- set default values to run.test.jvmargs.external property -->
 <not><isset property="run.test.jvmargs.external"/></not>
 </condition>
 <!-- loading locally defined resources and properties. NB they owerwrite default ones defined later -->
 <property file="${user.home}/.nashorn.project.local.properties"/>
-<loadproperties srcFile="make/project.properties"/>
+<loadproperties srcFile="make/nashorn/project.properties"/>
 </target>
 <target name="init-conditions" depends="load-properties">
 <path id="nashorn.jar.path">
 <pathelement location="${nashorn.jar}"/>
 <condition property="cc.enabled">
 <istrue value="${make.code.coverage}" />
 </condition>
 <!-- exclude tests in exclude lists -->
-<condition property="exclude.list" value="./exclude/exclude_list_cc.txt" else="./exclude/exclude_list.txt">
+<condition property="exclude.list" value="${nashorn.make.dir}/exclude/exclude_list_cc.txt" else="${nashorn.make.dir}/exclude/exclude_list.txt">
 <istrue value="${make.code.coverage}" />
 </condition>
 <condition property="jfr.options" value="${run.test.jvmargs.jfr}" else="">
 <istrue value="${jfr}"/>
 <target name="clean" depends="init, clean-nasgen, init-cc-cleanup">
 <delete includeemptydirs="true">
 <fileset dir="${build.dir}" erroronmissingdir="false"/>
 </delete>
 <delete dir="${dist.dir}"/>
+<delete dir="${jdk.build.dir}/nashorn_code_cache"/>
+<delete file="${basedir}/NashornProfile.txt"/>
 </target>
 <target name="compile" depends="prepare" description="Compiles nashorn">
 <javac srcdir="${dynalink.module.src.dir}"
 destdir="${dynalink.module.classes.dir}"
 <target name="javadoc" depends="jar">
 <javadoc destdir="${dist.javadoc.dir}" use="yes"
 windowtitle="${nashorn.product.name} ${nashorn.version}"
 additionalparam="-quiet" failonerror="true" useexternalfile="true">
 <arg value="--module-source-path"/>
-<arg value="${basedir}/src/*/share/classes"/>
+<arg value="${nashorn.module.src.dir}"/>
+<arg value="--module-source-path"/>
+<arg value="${dynalink.module.src.dir}"/>
 <arg value="${javadoc.option}"/>
 <classpath>
 <pathelement location="${build.classes.dir}"/>
 </classpath>
 <fileset dir="${dynalink.module.src.dir}" includes="**/*.java"/>
 <mkdir dir="${dist.nashornapi.javadoc.dir}"/>
 <javadoc destdir="${dist.nashornapi.javadoc.dir}" use="yes"
 extdirs="${nashorn.ext.path}" windowtitle="${nashorn.product.name} ${nashorn.version}"
 additionalparam="-quiet" failonerror="true" useexternalfile="true">
 <arg value="--module-source-path"/>
-<arg value="${basedir}/src/*/share/classes"/>
+<arg value="${nashorn.module.src.dir}"/>
 <arg value="${javadoc.option}"/>
 <classpath>
 <pathelement location="${build.classes.dir}"/>
 </classpath>
 <fileset dir="${nashorn.module.src.dir}" includes="jdk/nashorn/api/**/*.java"/>
 <mkdir dir="${dist.dynalinkapi.javadoc.dir}"/>
 <javadoc destdir="${dist.dynalinkapi.javadoc.dir}" use="yes"
 windowtitle="Dynalink"
 additionalparam="-quiet" failonerror="true" useexternalfile="true">
 <arg value="--module-source-path"/>
-<arg value="${basedir}/src/*/share/classes"/>
+<arg value="${dynalink.module.src.dir}"/>
 <arg value="${javadoc.option}"/>
 <classpath>
 <pathelement location="${build.classes.dir}"/>
 </classpath>
 <fileset dir="${dynalink.module.src.dir}" includes="**/*.java" excludes="jdk/dynalink/internal/*.java"/>
 grant codeBase "file:/${basedir}/${nashorn.api.tests.jar}" {
 permission java.util.PropertyPermission "parserapitest.*", "read";
 permission java.util.PropertyPermission "test.*", "read";
 permission java.util.PropertyPermission "test262.*", "read";
-permission java.io.FilePermission "${basedir}/test/-","read";
+permission java.io.FilePermission "${basedir}/test/nashorn/-","read";
 permission java.io.FilePermission "$${user.dir}", "read";
 permission java.util.PropertyPermission "user.dir", "read";
 };
 grant codeBase "file:/${basedir}/${file.reference.testng.jar}" {
 grant codeBase "file:/${file.reference.snakeyaml.jar}" {
 permission java.security.AllPermission;
 };
-grant codeBase "file:/${basedir}/test/script/trusted/*" {
+grant codeBase "file:/${basedir}/${test.script.dir}/trusted/*" {
 permission java.security.AllPermission;
 };
-grant codeBase "file:/${basedir}/test/script/maptests/*" {
+grant codeBase "file:/${basedir}/${test.script.dir}/maptests/*" {
-permission java.io.FilePermission "${basedir}/test/script/maptests/*","read";
+permission java.io.FilePermission "${basedir}/${test.script.dir}/maptests/*","read";
 permission java.lang.RuntimePermission "nashorn.debugMode";
 };
-grant codeBase "file:/${basedir}/test/script/basic/*" {
+grant codeBase "file:/${basedir}/${test.script.dir}/basic/*" {
-permission java.io.FilePermission "${basedir}/test/script/-", "read";
+permission java.io.FilePermission "${basedir}/${test.script.dir}/-", "read";
 permission java.io.FilePermission "$${user.dir}", "read";
 permission java.util.PropertyPermission "user.dir", "read";
 permission java.util.PropertyPermission "nashorn.test.*", "read";
 };
-grant codeBase "file:/${basedir}/test/script/basic/apply_to_call/*" {
+grant codeBase "file:/${basedir}/${test.script.dir}/basic/apply_to_call/*" {
-permission java.io.FilePermission "${basedir}/test/script/-", "read";
+permission java.io.FilePermission "${basedir}/${test.script.dir}/-", "read";
 permission java.io.FilePermission "$${user.dir}", "read";
 permission java.util.PropertyPermission "user.dir", "read";
 permission java.util.PropertyPermission "nashorn.test.*", "read";
 };
-grant codeBase "file:/${basedir}/test/script/basic/parser/*" {
+grant codeBase "file:/${basedir}/${test.script.dir}/basic/parser/*" {
-permission java.io.FilePermission "${basedir}/test/script/-", "read";
+permission java.io.FilePermission "${basedir}/${test.script.dir}/-", "read";
 permission java.io.FilePermission "$${user.dir}", "read";
 permission java.util.PropertyPermission "user.dir", "read";
 permission java.util.PropertyPermission "nashorn.test.*", "read";
 };
-grant codeBase "file:/${basedir}/test/script/basic/es6/*" {
+grant codeBase "file:/${basedir}/${test.script.dir}/basic/es6/*" {
-permission java.io.FilePermission "${basedir}/test/script/-", "read";
+permission java.io.FilePermission "${basedir}/${test.script.dir}/-", "read";
 permission java.io.FilePermission "$${user.dir}", "read";
 permission java.util.PropertyPermission "user.dir", "read";
 permission java.util.PropertyPermission "nashorn.test.*", "read";
 };
-grant codeBase "file:/${basedir}/test/script/basic/JDK-8010946-privileged.js" {
+grant codeBase "file:/${basedir}/${test.script.dir}/basic/JDK-8010946-privileged.js" {
 permission java.util.PropertyPermission "java.security.policy", "read";
 };
-grant codeBase "file:/${basedir}/test/script/basic/classloader.js" {
+grant codeBase "file:/${basedir}/${test.script.dir}/basic/classloader.js" {
 permission java.lang.RuntimePermission "nashorn.JavaReflection";
 };
-grant codeBase "file:/${basedir}/test/script/markdown.js" {
+grant codeBase "file:/${basedir}/${test.script.dir}/markdown.js" {
-permission java.io.FilePermission "${basedir}/test/script/external/showdown/-", "read";
+permission java.io.FilePermission "${basedir}/${test.script.dir}/external/showdown/-", "read";
 };
-grant codeBase "file:/${basedir}/test/script/basic/JDK-8158467.js" {
+grant codeBase "file:/${basedir}/${test.script.dir}/basic/JDK-8158467.js" {
 permission java.lang.RuntimePermission "nashorn.setConfig";
 };
 </echo>
 <pathelement path="${run.test.classpath}"/>
 </classpath>
 </testng>
 </target>
-<target name="test" depends="prepare, javadoc, test-pessimistic, test-optimistic"/>
+<target name="test" depends="prepare, test-pessimistic, test-optimistic"/>
 <target name="test-optimistic" depends="jar, -test-classes-all,-test-classes-single, check-testng, check-external-tests, compile-test, generate-security-config" if="testng.available">
 <echo message="Running test suite in OPTIMISTIC mode..."/>
 <antcall target="-test-nosecurity" inheritRefs="true">
 <param name="optimistic" value="true"/>

changeset 47217	72e3ae9a25eb
parent 47216	71c04702a3d5
child 47228	eda0a1f0e83e