proper ghc_setup / ocaml_setup on target Isabelle distribution (amending 2a17c481d05e);
authorwenzelm
Wed Nov 07 14:03:47 2018 +0100 (6 months ago)
changeset 692538bfa615ddde4
parent 69249 27423819534c
child 69254 9f8d26b8c731
proper ghc_setup / ocaml_setup on target Isabelle distribution (amending 2a17c481d05e);
src/Pure/Admin/build_history.scala
src/Pure/Admin/isabelle_cronjob.scala
     1.1 --- a/src/Pure/Admin/build_history.scala	Tue Nov 06 15:06:30 2018 +0100
     1.2 +++ b/src/Pure/Admin/build_history.scala	Wed Nov 07 14:03:47 2018 +0100
     1.3 @@ -205,6 +205,12 @@
     1.4            "env PATH=\"" + File.bash_path(Path.explode("~~/lib/dummy_stty").expand) + ":$PATH\" " +
     1.5              "bin/isabelle jedit -b", redirect = true, echo = verbose).check
     1.6  
     1.7 +        for {
     1.8 +          tool <- List("ghc_setup", "ocaml_setup")
     1.9 +          if other_isabelle.getenv("ISABELLE_" + Word.uppercase(tool)) == "true" &&
    1.10 +            (other_isabelle.isabelle_home + Path.explode("lib/Tools/" + tool)).is_file
    1.11 +        } other_isabelle(tool, echo = verbose)
    1.12 +
    1.13          Isabelle_System.rm_tree(isabelle_base_log)
    1.14        }
    1.15  
    1.16 @@ -513,8 +519,6 @@
    1.17      progress: Progress = No_Progress,
    1.18      rev: String = "",
    1.19      afp_rev: Option[String] = None,
    1.20 -    ghc_setup: Boolean = false,
    1.21 -    ocaml_setup: Boolean = false,
    1.22      options: String = "",
    1.23      args: String = ""): List[(String, Bytes)] =
    1.24    {
    1.25 @@ -539,10 +543,6 @@
    1.26        execute("bin/isabelle", "components -I")
    1.27        execute("bin/isabelle", "components -a", echo = true)
    1.28        execute("Admin/build", "jars_fresh")
    1.29 -      for {
    1.30 -        (setup, tool) <- List((ghc_setup, "ghc_setup"), (ocaml_setup, "ocaml_setup"))
    1.31 -        if setup && ssh.is_file(Path.explode("lib/Tools/" + tool))
    1.32 -      } execute("bin/isabelle", tool, echo = true)
    1.33      }
    1.34  
    1.35      val rev_id = self_hg.id(rev)
     2.1 --- a/src/Pure/Admin/isabelle_cronjob.scala	Tue Nov 06 15:06:30 2018 +0100
     2.2 +++ b/src/Pure/Admin/isabelle_cronjob.scala	Wed Nov 07 14:03:47 2018 +0100
     2.3 @@ -159,8 +159,6 @@
     2.4      historic: Boolean = false,
     2.5      history: Int = 0,
     2.6      history_base: String = "build_history_base",
     2.7 -    ghc_setup: Boolean = false,
     2.8 -    ocaml_setup: Boolean = false,
     2.9      options: String = "",
    2.10      args: String = "",
    2.11      afp: Boolean = false,
    2.12 @@ -288,8 +286,8 @@
    2.13            detect = Build_Log.Prop.build_start + " > date '2017-03-03'")),
    2.14        List(Remote_Build("Mac OS X 10.10 Yosemite", "macbroy31", options = "-m32 -M2", args = "-a")),
    2.15        List(Remote_Build("Mac OS X 10.14 Mojave", "lapnipkow3", self_update = true,
    2.16 -        ghc_setup = true, ocaml_setup = true,
    2.17 -        options = "-m32 -M1,2", args = "-a -d '~~/src/Benchmarks'")),
    2.18 +        options = "-m32 -M1,2 -e ISABELLE_GHC_SETUP=true -e ISABELLE_OCAML_SETUP=true",
    2.19 +        args = "-a -d '~~/src/Benchmarks'")),
    2.20        List(
    2.21          Remote_Build("Windows", "vmnipkow9", historic = true, history = 90, self_update = true,
    2.22            options = "-m32 -M4" +
    2.23 @@ -350,8 +348,6 @@
    2.24                  self_update = r.self_update,
    2.25                  rev = rev,
    2.26                  afp_rev = afp_rev,
    2.27 -                ghc_setup = r.ghc_setup,
    2.28 -                ocaml_setup = r.ocaml_setup,
    2.29                  options =
    2.30                    " -N " + Bash.string(task_name) + (if (i < 0) "" else "_" + (i + 1).toString) +
    2.31                    " -f " + r.options,