diff -r c07d10ac688d -r d44e2d1ca84f src/Pure/Admin/other_isabelle.scala --- a/src/Pure/Admin/other_isabelle.scala Wed Jan 25 14:58:34 2023 +0100 +++ b/src/Pure/Admin/other_isabelle.scala Wed Jan 25 15:18:06 2023 +0100 @@ -71,25 +71,6 @@ def etc_settings: Path = etc + Path.explode("settings") def etc_preferences: Path = etc + Path.explode("preferences") - def scala_build(fresh: Boolean = false, echo: Boolean = false): Unit = { - if (fresh) ssh.rm_tree(isabelle_home + Path.explode("lib/classes")) - - val dummy_stty = Path.explode("~~/lib/dummy_stty/stty") - val dummy_stty_remote = expand_path(dummy_stty) - if (!ssh.is_file(dummy_stty_remote)) { - ssh.make_directory(dummy_stty_remote.dir) - ssh.write_file(dummy_stty_remote, dummy_stty) - ssh.set_executable(dummy_stty_remote, true) - } - try { - bash( - "export PATH=\"" + bash_path(dummy_stty_remote.dir) + ":$PATH\"\n" + - "export CLASSPATH=" + Bash.string(getenv("ISABELLE_CLASSPATH")) + "\n" + - "bin/isabelle jedit -b", echo = echo).check - } - catch { case ERROR(msg) => cat_error("Failed to build Isabelle/Scala/Java modules:", msg) } - } - /* components */ @@ -116,6 +97,25 @@ } } + def scala_build(fresh: Boolean = false, echo: Boolean = false): Unit = { + if (fresh) ssh.rm_tree(isabelle_home + Path.explode("lib/classes")) + + val dummy_stty = Path.explode("~~/lib/dummy_stty/stty") + val dummy_stty_remote = expand_path(dummy_stty) + if (!ssh.is_file(dummy_stty_remote)) { + ssh.make_directory(dummy_stty_remote.dir) + ssh.write_file(dummy_stty_remote, dummy_stty) + ssh.set_executable(dummy_stty_remote, true) + } + try { + bash( + "export PATH=\"" + bash_path(dummy_stty_remote.dir) + ":$PATH\"\n" + + "export CLASSPATH=" + Bash.string(getenv("ISABELLE_CLASSPATH")) + "\n" + + "bin/isabelle jedit -b", echo = echo).check + } + catch { case ERROR(msg) => cat_error("Failed to build Isabelle/Scala/Java modules:", msg) } + } + /* settings */