Mercurial Mercurial > repos > isabelle / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
discontinue java.ext.dirs for jdk-11 -- in contrast to 982f0bf34804 for jdk-8;
authorwenzelm
Fri, 05 Oct 2018 23:49:12 +0200
changeset 69126 e1b4b14ded58
parent 69125 60b6c759134f
child 69127 4596b580d1dd
discontinue java.ext.dirs for jdk-11 -- in contrast to 982f0bf34804 for jdk-8;
Admin/Linux/Isabelle.run file | annotate | diff | comparison | revisions
Admin/MacOS/Info.plist-part2 file | annotate | diff | comparison | revisions
Admin/Windows/launch4j/isabelle.xml file | annotate | diff | comparison | revisions
bin/isabelle_java file | annotate | diff | comparison | revisions
lib/Tools/java file | annotate | diff | comparison | revisions
lib/Tools/scala file | annotate | diff | comparison | revisions
lib/Tools/scalac file | annotate | diff | comparison | revisions 
--- a/Admin/Linux/Isabelle.run	Fri Oct 05 17:49:10 2018 +0200
+++ b/Admin/Linux/Isabelle.run	Fri Oct 05 23:49:12 2018 +0200
@@ -30,7 +30,6 @@
 
 exec "$ISABELLE_HOME/contrib/jdk/x86_64-linux/jre/bin/java" \
   "-Disabelle.root=$ISABELLE_HOME" "${JAVA_OPTIONS[@]}" \
-  "-Djava.ext.dirs=$ISABELLE_HOME/contrib/jdk/x86_64-linux/jre/lib/ext" \
   -classpath "{CLASSPATH}" \
   "-splash:$ISABELLE_HOME/lib/logo/isabelle.gif" \
   isabelle.Main "$@"
--- a/Admin/MacOS/Info.plist-part2	Fri Oct 05 17:49:10 2018 +0200
+++ b/Admin/MacOS/Info.plist-part2	Fri Oct 05 23:49:12 2018 +0200
@@ -1,5 +1,4 @@
 <string>-Disabelle.root=$APP_ROOT/Contents/Resources/{ISABELLE_NAME}</string>
-<string>-Djava.ext.dirs=$APP_ROOT/Contents/Resources/{ISABELLE_NAME}/contrib/jdk/x86_64-darwin/Contents/Home/jre/lib/ext</string>
 <string>-Disabelle.app=true</string>
 </array>
 <key>JVMArguments</key>
--- a/Admin/Windows/launch4j/isabelle.xml	Fri Oct 05 17:49:10 2018 +0200
+++ b/Admin/Windows/launch4j/isabelle.xml	Fri Oct 05 23:49:12 2018 +0200
@@ -30,7 +30,7 @@
     <maxVersion></maxVersion>
     <jdkPreference>jdkOnly</jdkPreference>
     <runtimeBits>64</runtimeBits>
-    <opt>-Disabelle.root=&quot;%EXEDIR%&quot; -Djava.ext.dirs=&quot;%EXEDIR%\contrib\jdk\x86_64-windows\jre\lib\ext&quot; -Dcygwin.root=&quot;%EXEDIR%\contrib\cygwin&quot;</opt>
+    <opt>-Disabelle.root=&quot;%EXEDIR%&quot; -Dcygwin.root=&quot;%EXEDIR%\contrib\cygwin&quot;</opt>
   </jre>
   <splash>
     <file>{SPLASH}</file>
--- a/bin/isabelle_java	Fri Oct 05 17:49:10 2018 +0200
+++ b/bin/isabelle_java	Fri Oct 05 23:49:12 2018 +0200
@@ -67,7 +67,6 @@
     unset ISABELLE_HOME
     unset CLASSPATH
     exec "$JAVA_HOME/bin/java" "${JAVA_ARGS[@]}" \
-      "-Djava.ext.dirs=$JAVA_HOME/lib/ext" \
       -classpath "$ISABELLE_CLASSPATH" "$@"
   fi
 }
--- a/lib/Tools/java	Fri Oct 05 17:49:10 2018 +0200
+++ b/lib/Tools/java	Fri Oct 05 23:49:12 2018 +0200
@@ -10,5 +10,4 @@
 unset CLASSPATH
 
 isabelle_java java "${JAVA_ARGS[@]}" \
-  "-Djava.ext.dirs=$(platform_path "$ISABELLE_JDK_HOME/jre/lib/ext")" \
   -classpath "$(platform_path "$ISABELLE_CLASSPATH")" "$@"
--- a/lib/Tools/scala	Fri Oct 05 17:49:10 2018 +0200
+++ b/lib/Tools/scala	Fri Oct 05 23:49:12 2018 +0200
@@ -14,5 +14,4 @@
 done
 
 isabelle_scala scala "${SCALA_ARGS[@]}" \
-  "-Djava.ext.dirs=$(platform_path "$ISABELLE_JDK_HOME/jre/lib/ext")" \
   -classpath "$(platform_path "$ISABELLE_CLASSPATH")" "$@"
--- a/lib/Tools/scalac	Fri Oct 05 17:49:10 2018 +0200
+++ b/lib/Tools/scalac	Fri Oct 05 23:49:12 2018 +0200
@@ -7,5 +7,4 @@
 isabelle_admin_build jars || exit $?
 
 isabelle_scala scalac -Dfile.encoding=UTF-8 \
-  "-Djava.ext.dirs=$(platform_path "$ISABELLE_JDK_HOME/jre/lib/ext")" \
   -classpath "$(platform_path "$ISABELLE_CLASSPATH")" "$@"
isabelle