diff options
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 72 |
1 files changed, 31 insertions, 41 deletions
diff --git a/make/build.xml b/make/build.xml index 7e2d999d..2bda503f 100644 --- a/make/build.xml +++ b/make/build.xml @@ -100,7 +100,8 @@ target="${javac.target}" debug="${javac.debug}" encoding="${javac.encoding}" - includeantruntime="false"> + includeantruntime="false" fork="true"> + <compilerarg value="-J-Djava.ext.dirs="/> <compilerarg value="-Xlint:unchecked"/> <compilerarg value="-Xlint:deprecation"/> <compilerarg value="-XDignore.symbol.file"/> @@ -218,8 +219,10 @@ target="${javac.target}" debug="${javac.debug}" encoding="${javac.encoding}" - includeantruntime="false"> - <compilerarg line="-extdirs """/> + includeantruntime="false" fork="true"> + <compilerarg value="-J-Djava.ext.dirs="/> + <compilerarg value="-Xlint:unchecked"/> + <compilerarg value="-Xlint:deprecation"/> </javac> <!-- tests that check nashorn internals and internal API --> @@ -235,44 +238,31 @@ </target> <target name="generate-policy-file" depends="prepare"> - <!-- Generating nashorn.policy file --> - - <!-- nashorn internal tests jar requires AllPermission --> - <echo message="grant codeBase "file:/${basedir}/${nashorn.internal.tests.jar}" {" file="${build.dir}/nashorn.policy"/> - <echo message="" file="${build.dir}/nashorn.policy" append="true"/> - <echo message=" permission java.security.AllPermission;" file="${build.dir}/nashorn.policy" append="true"/> - <echo message="" file="${build.dir}/nashorn.policy" append="true"/> - <echo message="};" file="${build.dir}/nashorn.policy" append="true"/> - <echo message="" file="${build.dir}/nashorn.policy" append="true"/> - - <!-- TestNG framework jar needs AllPermission --> - <echo message="grant codeBase "file:/${basedir}/${file.reference.testng.jar}" {" file="${build.dir}/nashorn.policy" append="true"/> - <echo message="" file="${build.dir}/nashorn.policy" append="true"/> - <echo message=" permission java.security.AllPermission;" file="${build.dir}/nashorn.policy" append="true"/> - <echo message="" file="${build.dir}/nashorn.policy" append="true"/> - <echo message="};" file="${build.dir}/nashorn.policy" append="true"/> - <echo message="" file="${build.dir}/nashorn.policy" append="true"/> - - <!-- AllPermission to test/script/trusted tests --> - <echo message="grant codeBase "file:/${basedir}/test/script/trusted/*" {" file="${build.dir}/nashorn.policy" append="true"/> - <echo message="" file="${build.dir}/nashorn.policy" append="true"/> - <echo message=" permission java.security.AllPermission;" file="${build.dir}/nashorn.policy" append="true"/> - <echo message="" file="${build.dir}/nashorn.policy" append="true"/> - <echo message="};" file="${build.dir}/nashorn.policy" append="true"/> - <echo message="" file="${build.dir}/nashorn.policy" append="true"/> - - <echo message="grant codeBase "file:/${basedir}/test/script/basic/*" {" file="${build.dir}/nashorn.policy" append="true"/> - <echo message="" file="${build.dir}/nashorn.policy" append="true"/> - <!-- test/script/basic .js scripts load other script tests --> - <echo message=" permission java.io.FilePermission "${basedir}/test/script/-", "read";" file="${build.dir}/nashorn.policy" append="true"/> - <echo message=" permission java.io.FilePermission "user.dir", "read";" file="${build.dir}/nashorn.policy" append="true"/> - <echo message=" permission java.util.PropertyPermission "user.dir", "read";" file="${build.dir}/nashorn.policy" append="true"/> - <echo message="" file="${build.dir}/nashorn.policy" append="true"/> - <!-- test/script/basic .js scripts can read nashorn.test.* properties --> - <echo message=" permission java.util.PropertyPermission "nashorn.test.*", "read";" file="${build.dir}/nashorn.policy" append="true"/> - <echo message="" file="${build.dir}/nashorn.policy" append="true"/> - <echo message="};" file="${build.dir}/nashorn.policy" append="true"/> - <echo message="" file="${build.dir}/nashorn.policy" append="true"/> + <echo file="${build.dir}/nashorn.policy"> + +grant codeBase "file:/${basedir}/${nashorn.internal.tests.jar}" { + permission java.security.AllPermission; +}; + +grant codeBase "file:/${basedir}/${file.reference.testng.jar}" { + permission java.security.AllPermission; +}; + +grant codeBase "file:/${basedir}/test/script/trusted/*" { + permission java.security.AllPermission; +}; + +grant codeBase "file:/${basedir}/test/script/basic/*" { + permission java.io.FilePermission "${basedir}/test/script/-", "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" { + permission java.util.PropertyPermission "java.security.policy", "read"; +}; + </echo> <replace file="${build.dir}/nashorn.policy"><replacetoken>\</replacetoken><replacevalue>/</replacevalue></replace> <!--hack for Windows - to make URLs with normal path separators --> <replace file="${build.dir}/nashorn.policy"><replacetoken>//</replacetoken><replacevalue>/</replacevalue></replace> <!--hack for Unix - to avoid leading // in URLs --> |