src/Pure/Admin/build_history.scala
changeset 69253 8bfa615ddde4
parent 69243 2a17c481d05e
child 69304 1f4afcde3334
--- a/src/Pure/Admin/build_history.scala	Tue Nov 06 15:06:30 2018 +0100
+++ b/src/Pure/Admin/build_history.scala	Wed Nov 07 14:03:47 2018 +0100
@@ -205,6 +205,12 @@
           "env PATH=\"" + File.bash_path(Path.explode("~~/lib/dummy_stty").expand) + ":$PATH\" " +
             "bin/isabelle jedit -b", redirect = true, echo = verbose).check
 
+        for {
+          tool <- List("ghc_setup", "ocaml_setup")
+          if other_isabelle.getenv("ISABELLE_" + Word.uppercase(tool)) == "true" &&
+            (other_isabelle.isabelle_home + Path.explode("lib/Tools/" + tool)).is_file
+        } other_isabelle(tool, echo = verbose)
+
         Isabelle_System.rm_tree(isabelle_base_log)
       }
 
@@ -513,8 +519,6 @@
     progress: Progress = No_Progress,
     rev: String = "",
     afp_rev: Option[String] = None,
-    ghc_setup: Boolean = false,
-    ocaml_setup: Boolean = false,
     options: String = "",
     args: String = ""): List[(String, Bytes)] =
   {
@@ -539,10 +543,6 @@
       execute("bin/isabelle", "components -I")
       execute("bin/isabelle", "components -a", echo = true)
       execute("Admin/build", "jars_fresh")
-      for {
-        (setup, tool) <- List((ghc_setup, "ghc_setup"), (ocaml_setup, "ocaml_setup"))
-        if setup && ssh.is_file(Path.explode("lib/Tools/" + tool))
-      } execute("bin/isabelle", tool, echo = true)
     }
 
     val rev_id = self_hg.id(rev)