updated settings: ISABELLE_OCAMLFIND, ISABELLE_OCAML_SETUP, but retain compatibility with historic versions that require ISABELLE_OCAMLC;
authorwenzelm
Wed Mar 20 20:33:40 2019 +0100 (4 weeks ago)
changeset 69927f387618d9053
parent 69926 110fff287217
child 69928 3ed262d72468
updated settings: ISABELLE_OCAMLFIND, ISABELLE_OCAML_SETUP, but retain compatibility with historic versions that require ISABELLE_OCAMLC;
src/Pure/Admin/isabelle_cronjob.scala
     1.1 --- a/src/Pure/Admin/isabelle_cronjob.scala	Wed Mar 20 20:15:30 2019 +0100
     1.2 +++ b/src/Pure/Admin/isabelle_cronjob.scala	Wed Mar 20 20:33:40 2019 +0100
     1.3 @@ -261,14 +261,16 @@
     1.4        List(Remote_Build("Linux Benchmarks", "lxbroy5", historic = true, history = 90,
     1.5          options = "-m32 -B -M1x2,2 -t Benchmarks" +
     1.6              " -e ISABELLE_GHC=ghc -e ISABELLE_MLTON=mlton -e ISABELLE_OCAML=ocaml" +
     1.7 -            " -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_SMLNJ=sml -e ISABELLE_SWIPL=swipl",
     1.8 +            " -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_OCAML_SETUP=true -e ISABELLE_SMLNJ=sml" +
     1.9 +            " -e ISABELLE_SWIPL=swipl",
    1.10            args = "-N -a -d '~~/src/Benchmarks'",
    1.11            detect = Build_Log.Prop.build_tags + " = " + SQL.string("Benchmarks"))),
    1.12        List(
    1.13          Remote_Build("Mac OS X", "macbroy2",
    1.14            options = "-m32 -M8" +
    1.15              " -e ISABELLE_GHC=ghc -e ISABELLE_MLTON=mlton -e ISABELLE_OCAML=ocaml" +
    1.16 -            " -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_SMLNJ=/mnt/nfsbroy/home/smlnj/bin/sml",
    1.17 +            " -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_OCAML_SETUP=true" +
    1.18 +            " -e ISABELLE_SMLNJ=/mnt/nfsbroy/home/smlnj/bin/sml",
    1.19            args = "-a",
    1.20            detect = Build_Log.Prop.build_tags.undefined,
    1.21            history_base = "2c0f24e927dd"),
    1.22 @@ -293,14 +295,14 @@
    1.23        List(
    1.24          Remote_Build("Windows", "vmnipkow9", historic = true, history = 90, self_update = true,
    1.25            options = "-m32 -M4" +
    1.26 -            " -e ISABELLE_OCAML=ocaml -e ISABELLE_OCAMLC=ocamlc" +
    1.27 +            " -e ISABELLE_OCAML=ocaml -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_OCAMLFIND=ocamlfind" +
    1.28              " -e ISABELLE_GHC=/usr/local/ghc-8.0.2/bin/ghc" +
    1.29              " -e ISABELLE_SMLNJ=/usr/local/smlnj-110.81/bin/sml",
    1.30            args = "-a",
    1.31            detect = Build_Log.Settings.ML_PLATFORM + " = " + SQL.string("x86-windows")),
    1.32          Remote_Build("Windows", "vmnipkow9", historic = true, history = 90, self_update = true,
    1.33            options = "-m64 -M4" +
    1.34 -            " -e ISABELLE_OCAML=ocaml -e ISABELLE_OCAMLC=ocamlc" +
    1.35 +            " -e ISABELLE_OCAML=ocaml -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_OCAMLFIND=ocamlfind" +
    1.36              " -e ISABELLE_GHC=/usr/local/ghc-8.0.2/bin/ghc" +
    1.37              " -e ISABELLE_SMLNJ=/usr/local/smlnj-110.81/bin/sml",
    1.38            args = "-a",
    1.39 @@ -313,7 +315,7 @@
    1.40            options = "-m32 -M1x2 -t AFP -P" + n +
    1.41              " -e ISABELLE_GHC=ghc" +
    1.42              " -e ISABELLE_MLTON=mlton" +
    1.43 -            " -e ISABELLE_OCAML=ocaml -e ISABELLE_OCAMLC=ocamlc" +
    1.44 +            " -e ISABELLE_OCAML=ocaml -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_OCAML_SETUP=true" +
    1.45              " -e ISABELLE_SMLNJ=/home/smlnj/bin/sml",
    1.46            args = "-N -X large -X slow",
    1.47            afp = true,