summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWade Walker <[email protected]>2018-12-28 09:45:45 -0600
committerSven Gothel <[email protected]>2019-08-19 07:11:46 +0200
commit14e0740459036f57a7b06ca04b66e60a7eef33ed (patch)
tree2695ad4d4562979fe240d15b9d745525934a0660
parentdf7c0ad3b98d3520f023e026b6163bcba2c7ee7e (diff)
Removed obsolete tools.jar
In Java 9+, the tools.jar file also no longer exists in Java installations (it's now stored in a secret non-JAR format), so removed it.
-rw-r--r--nbproject/ide-file-targets.xml4
-rw-r--r--nbproject/project.xml2
2 files changed, 3 insertions, 3 deletions
diff --git a/nbproject/ide-file-targets.xml b/nbproject/ide-file-targets.xml
index 666cf0106..0c83b8b74 100644
--- a/nbproject/ide-file-targets.xml
+++ b/nbproject/ide-file-targets.xml
@@ -5,7 +5,7 @@
<property name="libpath" value="${basedir}/build/lib"/>
<target name="init">
<path id="cp">
- <pathelement path="${jdk.home}/lib/tools.jar:${ant.core.lib}:${ant.home}/lib/ant-junit.jar"/>
+ <pathelement path="${ant.core.lib}:${ant.home}/lib/ant-junit.jar"/>
<pathelement location="../gluegen/make/lib/junit.jar"/>
<pathelement location="../gluegen/build/gluegen-rt.jar"/>
<pathelement location="build/test/build/classes"/>
@@ -73,7 +73,7 @@
<fail unless="files">Must set property 'files'</fail>
<mkdir dir="build/classes"/>
<javac destdir="build/classes" includes="${files}" source="1.5" srcdir="src/java">
- <classpath path="build/classes:${jdk.home}/lib/tools.jar:${ant.core.lib}:lib/antlr-3.2.jar"/>
+ <classpath path="build/classes:${ant.core.lib}:lib/antlr-3.2.jar"/>
</javac>
</target>
</project>
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 32d850e34..10b4c0f44 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -208,7 +208,7 @@
<compilation-unit>
<package-root>src/test</package-root>
<unit-tests/>
- <classpath mode="compile">build/jogl/classes:build/jogl/gensrc/classes:build/newt/classes:build/nativewindow/classes:build/nativewindow/gensrc/classes:build/test/build/classes:${jdk.home}/lib/tools.jar:${ant.core.lib}:${ant.home}/lib/ant-junit.jar:../gluegen/make/lib/antlr.jar:../gluegen/make/lib/junit.jar:../gluegen/build/gluegen-rt.jar:make/lib/swt/gtk-linux-x86_64/swt-debug.jar</classpath>
+ <classpath mode="compile">build/jogl/classes:build/jogl/gensrc/classes:build/newt/classes:build/nativewindow/classes:build/nativewindow/gensrc/classes:build/test/build/classes:${ant.core.lib}:${ant.home}/lib/ant-junit.jar:../gluegen/make/lib/antlr.jar:../gluegen/make/lib/junit.jar:../gluegen/build/gluegen-rt.jar:make/lib/swt/gtk-linux-x86_64/swt-debug.jar</classpath>
<built-to>bin</built-to>
<source-level>1.5</source-level>
</compilation-unit>