discontinue java.ext.dirs for jdk-11 -- in contrast to 982f0bf34804 for jdk-8;
authorwenzelm
Fri Oct 05 23:49:12 2018 +0200 (11 months ago)
changeset 69126e1b4b14ded58
parent 69125 60b6c759134f
child 69127 4596b580d1dd
discontinue java.ext.dirs for jdk-11 -- in contrast to 982f0bf34804 for jdk-8;
Admin/Linux/Isabelle.run
Admin/MacOS/Info.plist-part2
Admin/Windows/launch4j/isabelle.xml
bin/isabelle_java
lib/Tools/java
lib/Tools/scala
lib/Tools/scalac
     1.1 --- a/Admin/Linux/Isabelle.run	Fri Oct 05 17:49:10 2018 +0200
     1.2 +++ b/Admin/Linux/Isabelle.run	Fri Oct 05 23:49:12 2018 +0200
     1.3 @@ -30,7 +30,6 @@
     1.4  
     1.5  exec "$ISABELLE_HOME/contrib/jdk/x86_64-linux/jre/bin/java" \
     1.6    "-Disabelle.root=$ISABELLE_HOME" "${JAVA_OPTIONS[@]}" \
     1.7 -  "-Djava.ext.dirs=$ISABELLE_HOME/contrib/jdk/x86_64-linux/jre/lib/ext" \
     1.8    -classpath "{CLASSPATH}" \
     1.9    "-splash:$ISABELLE_HOME/lib/logo/isabelle.gif" \
    1.10    isabelle.Main "$@"
     2.1 --- a/Admin/MacOS/Info.plist-part2	Fri Oct 05 17:49:10 2018 +0200
     2.2 +++ b/Admin/MacOS/Info.plist-part2	Fri Oct 05 23:49:12 2018 +0200
     2.3 @@ -1,5 +1,4 @@
     2.4  <string>-Disabelle.root=$APP_ROOT/Contents/Resources/{ISABELLE_NAME}</string>
     2.5 -<string>-Djava.ext.dirs=$APP_ROOT/Contents/Resources/{ISABELLE_NAME}/contrib/jdk/x86_64-darwin/Contents/Home/jre/lib/ext</string>
     2.6  <string>-Disabelle.app=true</string>
     2.7  </array>
     2.8  <key>JVMArguments</key>
     3.1 --- a/Admin/Windows/launch4j/isabelle.xml	Fri Oct 05 17:49:10 2018 +0200
     3.2 +++ b/Admin/Windows/launch4j/isabelle.xml	Fri Oct 05 23:49:12 2018 +0200
     3.3 @@ -30,7 +30,7 @@
     3.4      <maxVersion></maxVersion>
     3.5      <jdkPreference>jdkOnly</jdkPreference>
     3.6      <runtimeBits>64</runtimeBits>
     3.7 -    <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>
     3.8 +    <opt>-Disabelle.root=&quot;%EXEDIR%&quot; -Dcygwin.root=&quot;%EXEDIR%\contrib\cygwin&quot;</opt>
     3.9    </jre>
    3.10    <splash>
    3.11      <file>{SPLASH}</file>
     4.1 --- a/bin/isabelle_java	Fri Oct 05 17:49:10 2018 +0200
     4.2 +++ b/bin/isabelle_java	Fri Oct 05 23:49:12 2018 +0200
     4.3 @@ -67,7 +67,6 @@
     4.4      unset ISABELLE_HOME
     4.5      unset CLASSPATH
     4.6      exec "$JAVA_HOME/bin/java" "${JAVA_ARGS[@]}" \
     4.7 -      "-Djava.ext.dirs=$JAVA_HOME/lib/ext" \
     4.8        -classpath "$ISABELLE_CLASSPATH" "$@"
     4.9    fi
    4.10  }
     5.1 --- a/lib/Tools/java	Fri Oct 05 17:49:10 2018 +0200
     5.2 +++ b/lib/Tools/java	Fri Oct 05 23:49:12 2018 +0200
     5.3 @@ -10,5 +10,4 @@
     5.4  unset CLASSPATH
     5.5  
     5.6  isabelle_java java "${JAVA_ARGS[@]}" \
     5.7 -  "-Djava.ext.dirs=$(platform_path "$ISABELLE_JDK_HOME/jre/lib/ext")" \
     5.8    -classpath "$(platform_path "$ISABELLE_CLASSPATH")" "$@"
     6.1 --- a/lib/Tools/scala	Fri Oct 05 17:49:10 2018 +0200
     6.2 +++ b/lib/Tools/scala	Fri Oct 05 23:49:12 2018 +0200
     6.3 @@ -14,5 +14,4 @@
     6.4  done
     6.5  
     6.6  isabelle_scala scala "${SCALA_ARGS[@]}" \
     6.7 -  "-Djava.ext.dirs=$(platform_path "$ISABELLE_JDK_HOME/jre/lib/ext")" \
     6.8    -classpath "$(platform_path "$ISABELLE_CLASSPATH")" "$@"
     7.1 --- a/lib/Tools/scalac	Fri Oct 05 17:49:10 2018 +0200
     7.2 +++ b/lib/Tools/scalac	Fri Oct 05 23:49:12 2018 +0200
     7.3 @@ -7,5 +7,4 @@
     7.4  isabelle_admin_build jars || exit $?
     7.5  
     7.6  isabelle_scala scalac -Dfile.encoding=UTF-8 \
     7.7 -  "-Djava.ext.dirs=$(platform_path "$ISABELLE_JDK_HOME/jre/lib/ext")" \
     7.8    -classpath "$(platform_path "$ISABELLE_CLASSPATH")" "$@"