# HG changeset patch
# User wenzelm
# Date 1625053772 -7200
# Node ID 4df63c3a4c4f532575bed3e52b4e23965a64f36f
# Parent  bf476aed616dd95369636283cd2eb55534ddff51
more direct java.home, according to current jdk directory layout;

diff -r bf476aed616d -r 4df63c3a4c4f src/Pure/System/isabelle_env.scala
--- a/src/Pure/System/isabelle_env.scala	Wed Jun 30 13:46:51 2021 +0200
+++ b/src/Pure/System/isabelle_env.scala	Wed Jun 30 13:49:32 2021 +0200
@@ -20,16 +20,6 @@
 {
   /** bootstrap information **/
 
-  def jdk_home(): String =
-  {
-    val java_home = System.getProperty("java.home", "")
-    val home = new JFile(java_home)
-    val parent = home.getParent
-    if (home.getName == "jre" && parent != null &&
-        (new JFile(new JFile(parent, "bin"), "javac")).exists) parent
-    else java_home
-  }
-
   def bootstrap_directory(
     preference: String, envar: String, property: String, description: String): String =
   {
@@ -247,7 +237,8 @@
           val temp = if (Platform.is_windows) System.getenv("TEMP") else null
           if (temp != null && temp.contains('\\')) temp else ""
         })
-      env_default("ISABELLE_JDK_HOME", standard_path(cygwin_root, jdk_home()))
+      env_default("ISABELLE_JDK_HOME",
+        standard_path(cygwin_root, System.getProperty("java.home", "")))
       env_default("HOME", System.getProperty("user.home", ""))
       env_default("ISABELLE_APP", System.getProperty("isabelle.app", ""))