76 lines
3.4 KiB
Diff
76 lines
3.4 KiB
Diff
diff --git a/make/nashorn/build.xml b/make/nashorn/build.xml
|
|
index 42b3380f..95b7cc4f 100644
|
|
--- a/make/nashorn/build.xml
|
|
+++ b/make/nashorn/build.xml
|
|
@@ -51,17 +51,6 @@
|
|
<condition property="git.executable" value="/usr/local/bin/git" else="git">
|
|
<available file="/usr/local/bin/git"/>
|
|
</condition>
|
|
- <!-- check if TestNG and dependencies are available, and download them if they aren't -->
|
|
- <property name="repo.url" value="https://repo1.maven.org/maven2"/>
|
|
- <antcall target="get-testng"/>
|
|
- <condition property="testng.available" value="true">
|
|
- <and>
|
|
- <available file="${file.reference.testng.jar}"/>
|
|
- <available file="${file.reference.jcommander.jar}"/>
|
|
- <available file="${file.reference.bsh.jar}"/>
|
|
- <available file="${file.reference.snakeyaml.jar}"/>
|
|
- </and>
|
|
- </condition>
|
|
|
|
<!-- check if asmtools-6.0.jar is available, and download it if it isn't -->
|
|
<!--
|
|
@@ -162,18 +151,6 @@
|
|
<property name="dist.dir.resolved" location="${dist.dir}"/>
|
|
</target>
|
|
|
|
- <target name="get-deps" depends="prepare">
|
|
- <property name="asm.version" value="7.3.1"/>
|
|
- <property name="asm.url" value="${repo.url}/org/ow2/asm"/>
|
|
- <get dest="${deps.dir}" skipexisting="true">
|
|
- <url url="${asm.url}/asm/${asm.version}/asm-${asm.version}.jar"/>
|
|
- <url url="${asm.url}/asm-analysis/${asm.version}/asm-analysis-${asm.version}.jar"/>
|
|
- <url url="${asm.url}/asm-commons/${asm.version}/asm-commons-${asm.version}.jar"/>
|
|
- <url url="${asm.url}/asm-tree/${asm.version}/asm-tree-${asm.version}.jar"/>
|
|
- <url url="${asm.url}/asm-util/${asm.version}/asm-util-${asm.version}.jar"/>
|
|
- </get>
|
|
- </target>
|
|
-
|
|
<target name="clean" depends="init, clean-nasgen, init-cc-cleanup">
|
|
<delete includeemptydirs="true">
|
|
<fileset dir="${build.dir}" erroronmissingdir="false"/>
|
|
@@ -183,7 +160,7 @@
|
|
<delete file="${basedir}/NashornProfile.txt"/>
|
|
</target>
|
|
|
|
- <target name="compile-nashorn" depends="get-deps" description="Compiles nashorn">
|
|
+ <target name="compile-nashorn" depends="prepare" description="Compiles nashorn">
|
|
<javac srcdir="${nashorn.module.src.dir}"
|
|
destdir="${nashorn.module.classes.dir}"
|
|
debug="${javac.debug}"
|
|
@@ -266,7 +243,6 @@
|
|
packagenames="org.openjdk.nashorn.api.scripting,org.openjdk.nashorn.api.tree"
|
|
modulepath="${deps.dir}">
|
|
<arg value="${javadoc.option}"/>
|
|
- <link href="https://docs.oracle.com/en/java/javase/15/docs/api"/>
|
|
</javadoc>
|
|
</target>
|
|
|
|
@@ -813,16 +789,6 @@ grant codeBase "file:/${basedir}/${test.script.dir}/basic/JDK-8158467.js" {
|
|
<!-- run all perf tests -->
|
|
<target name="perf" depends="externals, update-externals, sunspider, octane"/>
|
|
|
|
- <!-- download and install testng.jar -->
|
|
- <target name="get-testng">
|
|
- <get dest="${test.lib}" skipexisting="true">
|
|
- <url url="${repo.url}/org/testng/testng/6.8/testng-6.8.jar"/>
|
|
- <url url="${repo.url}/com/beust/jcommander/1.27/jcommander-1.27.jar"/>
|
|
- <url url="${repo.url}/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/>
|
|
- <url url="${repo.url}/org/yaml/snakeyaml/1.6/snakeyaml-1.6.jar"/>
|
|
- </get>
|
|
- </target>
|
|
-
|
|
<!-- download and install asmtools.jar -->
|
|
<target name="get-asmtools" unless="asmtools.already.present">
|
|
<get src="https://adopt-openjdk.ci.cloudbees.com/view/OpenJDK/job/asmtools/lastSuccessfulBuild/artifact/asmtools-6.0.tar.gz" dest="${test.lib}" skipexisting="true" ignoreerrors="true"/>
|