src/Pure/Admin/build_release.scala

--- a/src/Pure/Admin/build_release.scala	Thu Jul 15 16:01:04 2021 +0200
+++ b/src/Pure/Admin/build_release.scala	Thu Jul 15 16:35:45 2021 +0200
@@ -188,7 +188,7 @@
           path = Components.admin(dir) + Path.basic(catalog)
           if path.is_file
           line <- split_lines(File.read(path))
-          if line.nonEmpty && !line.startsWith("#") && !line.startsWith("jedit_build")
+          if line.nonEmpty && !line.startsWith("#")
         } yield bundled(line)).toList))
   }
 
@@ -196,10 +196,7 @@
   {
     val Bundled = new Bundled(platform = Some(platform))
     val components =
-      for {
-        Bundled(name) <- Components.read_components(dir)
-        if !name.startsWith("jedit_build")
-      } yield name
+      for { Bundled(name) <- Components.read_components(dir) } yield name
     val jdk_component =
       components.find(_.startsWith("jdk")) getOrElse error("Missing jdk component")
     (components, jdk_component)
@@ -316,7 +313,7 @@
   -classpath """" + classpath.map(p => "$ISABELLE_HOME/" + p.implode).mkString(":") + """" \
   "-splash:$ISABELLE_HOME/lib/logo/isabelle.gif" \
 """ + (if (dock_icon) """"-Xdock:icon=$ISABELLE_HOME/lib/logo/isabelle_transparent-128.png" \
-""" else "") + """isabelle.Main "$@"
+""" else "") + """isabelle.jedit.Main "$@"
 """
     val script_path = isabelle_target + Path.explode("lib/scripts/Isabelle_app")
     File.write(script_path, script)
@@ -584,18 +581,19 @@
         val classpath: List[Path] =
         {
           val base = isabelle_target.absolute
-          Path.split(other_isabelle.getenv("ISABELLE_CLASSPATH")).map(path =>
+          Path.split(other_isabelle.setup_classpath()).map(path =>
           {
             val abs_path = path.absolute
             File.relative_path(base, abs_path) match {
               case Some(rel_path) => rel_path
               case None => error("Bad ISABELLE_CLASSPATH element: " + abs_path)
             }
-          }) ::: List(Path.explode("src/Tools/jEdit/dist/jedit.jar"))
+          })
         }
 
         val jedit_options = Path.explode("src/Tools/jEdit/etc/options")
-        val jedit_props = Path.explode("src/Tools/jEdit/dist/properties/jEdit.props")
+        val jedit_props =
+          Path.explode(other_isabelle.getenv("JEDIT_HOME") + "/properties/jEdit.props")
 
 
         // build heaps