updated settings: ISABELLE_OCAMLFIND, ISABELLE_OCAML_SETUP, but retain compatibility with historic versions that require ISABELLE_OCAMLC;
--- a/src/Pure/Admin/isabelle_cronjob.scala Wed Mar 20 20:15:30 2019 +0100
+++ b/src/Pure/Admin/isabelle_cronjob.scala Wed Mar 20 20:33:40 2019 +0100
@@ -261,14 +261,16 @@
List(Remote_Build("Linux Benchmarks", "lxbroy5", historic = true, history = 90,
options = "-m32 -B -M1x2,2 -t Benchmarks" +
" -e ISABELLE_GHC=ghc -e ISABELLE_MLTON=mlton -e ISABELLE_OCAML=ocaml" +
- " -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_SMLNJ=sml -e ISABELLE_SWIPL=swipl",
+ " -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_OCAML_SETUP=true -e ISABELLE_SMLNJ=sml" +
+ " -e ISABELLE_SWIPL=swipl",
args = "-N -a -d '~~/src/Benchmarks'",
detect = Build_Log.Prop.build_tags + " = " + SQL.string("Benchmarks"))),
List(
Remote_Build("Mac OS X", "macbroy2",
options = "-m32 -M8" +
" -e ISABELLE_GHC=ghc -e ISABELLE_MLTON=mlton -e ISABELLE_OCAML=ocaml" +
- " -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_SMLNJ=/mnt/nfsbroy/home/smlnj/bin/sml",
+ " -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_OCAML_SETUP=true" +
+ " -e ISABELLE_SMLNJ=/mnt/nfsbroy/home/smlnj/bin/sml",
args = "-a",
detect = Build_Log.Prop.build_tags.undefined,
history_base = "2c0f24e927dd"),
@@ -293,14 +295,14 @@
List(
Remote_Build("Windows", "vmnipkow9", historic = true, history = 90, self_update = true,
options = "-m32 -M4" +
- " -e ISABELLE_OCAML=ocaml -e ISABELLE_OCAMLC=ocamlc" +
+ " -e ISABELLE_OCAML=ocaml -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_OCAMLFIND=ocamlfind" +
" -e ISABELLE_GHC=/usr/local/ghc-8.0.2/bin/ghc" +
" -e ISABELLE_SMLNJ=/usr/local/smlnj-110.81/bin/sml",
args = "-a",
detect = Build_Log.Settings.ML_PLATFORM + " = " + SQL.string("x86-windows")),
Remote_Build("Windows", "vmnipkow9", historic = true, history = 90, self_update = true,
options = "-m64 -M4" +
- " -e ISABELLE_OCAML=ocaml -e ISABELLE_OCAMLC=ocamlc" +
+ " -e ISABELLE_OCAML=ocaml -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_OCAMLFIND=ocamlfind" +
" -e ISABELLE_GHC=/usr/local/ghc-8.0.2/bin/ghc" +
" -e ISABELLE_SMLNJ=/usr/local/smlnj-110.81/bin/sml",
args = "-a",
@@ -313,7 +315,7 @@
options = "-m32 -M1x2 -t AFP -P" + n +
" -e ISABELLE_GHC=ghc" +
" -e ISABELLE_MLTON=mlton" +
- " -e ISABELLE_OCAML=ocaml -e ISABELLE_OCAMLC=ocamlc" +
+ " -e ISABELLE_OCAML=ocaml -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_OCAML_SETUP=true" +
" -e ISABELLE_SMLNJ=/home/smlnj/bin/sml",
args = "-N -X large -X slow",
afp = true,