merged
authorwenzelm
Fri Mar 22 22:37:30 2019 +0100 (3 weeks ago)
changeset 699533544cca7920f
parent 69947 77a92e8d5167
parent 69952 385458b950e1
child 69954 96905404ffba
merged
     1.1 --- a/Admin/components/bundled-windows	Fri Mar 22 19:18:09 2019 +0000
     1.2 +++ b/Admin/components/bundled-windows	Fri Mar 22 22:37:30 2019 +0100
     1.3 @@ -1,3 +1,3 @@
     1.4  #additional components to be bundled for release
     1.5 -cygwin-20190320
     1.6 +cygwin-20190322
     1.7  windows_app-20181006
     2.1 --- a/Admin/components/components.sha1	Fri Mar 22 19:18:09 2019 +0000
     2.2 +++ b/Admin/components/components.sha1	Fri Mar 22 22:37:30 2019 +0100
     2.3 @@ -48,6 +48,7 @@
     2.4  c22048912b010a5a0b4f2a3eb4d318d6953761e4  cygwin-20170930.tar.gz
     2.5  5a3919e665947b820fd7f57787280c7512be3782  cygwin-20180604.tar.gz
     2.6  2aa049170e8088de59bd70eed8220f552093932d  cygwin-20190320.tar.gz
     2.7 +fb898e263fcf6f847d97f564fe49ea0760bb453f  cygwin-20190322.tar.gz
     2.8  0fe549949a025d65d52d6deca30554de8fca3b6e  e-1.5.tar.gz
     2.9  2e293256a134eb8e5b1a283361b15eb812fbfbf1  e-1.6-1.tar.gz
    2.10  e1919e72416cbd7ac8de5455caba8901acc7b44d  e-1.6-2.tar.gz
     3.1 --- a/lib/Tools/ocaml_setup	Fri Mar 22 19:18:09 2019 +0000
     3.2 +++ b/lib/Tools/ocaml_setup	Fri Mar 22 22:37:30 2019 +0100
     3.3 @@ -6,11 +6,14 @@
     3.4  
     3.5  set -e
     3.6  
     3.7 -if [ -e "$ISABELLE_OPAM_ROOT/config" ]
     3.8 +if [ -d "$ISABELLE_OPAM_ROOT/$ISABELLE_OCAML_VERSION/bin" ]
     3.9  then
    3.10 -  isabelle_opam switch reinstall -y "$ISABELLE_OCAML_VERSION"
    3.11 +  isabelle_opam switch -y "$ISABELLE_OCAML_VERSION"
    3.12 +elif [ -e "$ISABELLE_OPAM_ROOT/config" ]
    3.13 +then
    3.14 +  isabelle_opam switch create -y "$ISABELLE_OCAML_VERSION"
    3.15  else
    3.16    isabelle_opam init -y --disable-sandboxing --no-setup --compiler="$ISABELLE_OCAML_VERSION"
    3.17  fi
    3.18  
    3.19 -isabelle_opam install zarith -y
    3.20 +isabelle_opam install -y zarith
     4.1 --- a/lib/scripts/ghc	Fri Mar 22 19:18:09 2019 +0000
     4.2 +++ b/lib/scripts/ghc	Fri Mar 22 22:37:30 2019 +0100
     4.3 @@ -4,7 +4,8 @@
     4.4  #
     4.5  # Invoke ghc via "stack".
     4.6  
     4.7 -if [ -e "$ISABELLE_STACK_ROOT/config.yaml" ]; then
     4.8 +if [ -f "$ISABELLE_STACK_ROOT/ISABELLE_GHC_EXE-$ISABELLE_PLATFORM_FAMILY" ]
     4.9 +then
    4.10    isabelle_stack ghc -- "$@"
    4.11  else
    4.12    echo "Cannot execute ghc: missing Isabelle GHC setup" >&2
     5.1 --- a/lib/scripts/ocamlfind	Fri Mar 22 19:18:09 2019 +0000
     5.2 +++ b/lib/scripts/ocamlfind	Fri Mar 22 22:37:30 2019 +0100
     5.3 @@ -4,7 +4,7 @@
     5.4  #
     5.5  # Invoke ocamlfind via "opam".
     5.6  
     5.7 -if [ -e "$ISABELLE_OPAM_ROOT/config" ]
     5.8 +if [ -d "$ISABELLE_OPAM_ROOT/$ISABELLE_OCAML_VERSION/bin" ]
     5.9  then
    5.10    isabelle_opam config exec --switch "$ISABELLE_OCAML_VERSION" -- ocamlfind "$@"
    5.11  else
     6.1 --- a/src/HOL/Library/code_test.ML	Fri Mar 22 19:18:09 2019 +0000
     6.2 +++ b/src/HOL/Library/code_test.ML	Fri Mar 22 22:37:30 2019 +0100
     6.3 @@ -467,9 +467,9 @@
     6.4  
     6.5      val compiled_path = Path.append path (Path.basic "test")
     6.6      val compile_cmd =
     6.7 -      "\"$ISABELLE_OCAMLFIND\" ocamlopt -w pu -package zarith -linkpkg " ^
     6.8 +      "\"$ISABELLE_OCAMLFIND\" ocamlopt -w pu -package zarith -linkpkg" ^
     6.9        " -o " ^ File.bash_path compiled_path ^ " -I " ^ File.bash_path path ^ " " ^
    6.10 -      File.bash_path code_path ^ " " ^ File.bash_path driver_path
    6.11 +      File.bash_path code_path ^ " " ^ File.bash_path driver_path ^ " </dev/null"
    6.12  
    6.13      val run_cmd = File.bash_path compiled_path
    6.14    in
     7.1 --- a/src/Pure/Admin/build_cygwin.scala	Fri Mar 22 19:18:09 2019 +0000
     7.2 +++ b/src/Pure/Admin/build_cygwin.scala	Fri Mar 22 22:37:30 2019 +0100
     7.3 @@ -12,7 +12,7 @@
     7.4    val default_mirror: String = "https://isabelle.sketis.net/cygwin_2019"
     7.5  
     7.6    val packages: List[String] =
     7.7 -    List("curl", "nano", "perl", "perl-libwww-perl", "rlwrap", "unzip")
     7.8 +    List("curl", "libgmp-devel", "nano", "perl", "perl-libwww-perl", "rlwrap", "unzip")
     7.9  
    7.10    def build_cygwin(progress: Progress,
    7.11      mirror: String = default_mirror,
     8.1 --- a/src/Pure/Admin/isabelle_cronjob.scala	Fri Mar 22 19:18:09 2019 +0000
     8.2 +++ b/src/Pure/Admin/isabelle_cronjob.scala	Fri Mar 22 22:37:30 2019 +0100
     8.3 @@ -261,7 +261,7 @@
     8.4        List(Remote_Build("Linux Benchmarks", "lxbroy5", historic = true, history = 90,
     8.5          options = "-m32 -B -M1x2,2 -t Benchmarks" +
     8.6              " -e ISABELLE_GHC=ghc -e ISABELLE_MLTON=mlton -e ISABELLE_OCAML=ocaml" +
     8.7 -            " -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_OCAML_SETUP=true -e ISABELLE_SMLNJ=sml" +
     8.8 +            " -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_OCAMLFIND=ocamlfind -e ISABELLE_SMLNJ=sml" +
     8.9              " -e ISABELLE_SWIPL=swipl",
    8.10            args = "-N -a -d '~~/src/Benchmarks'",
    8.11            detect = Build_Log.Prop.build_tags + " = " + SQL.string("Benchmarks"))),
    8.12 @@ -296,14 +296,14 @@
    8.13          Remote_Build("Windows", "vmnipkow9", historic = true, history = 90, self_update = true,
    8.14            options = "-m32 -M4" +
    8.15              " -e ISABELLE_OCAML=ocaml -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_OCAML_SETUP=true" +
    8.16 -            " -e ISABELLE_GHC=/usr/local/ghc-8.0.2/bin/ghc" +
    8.17 +            " -e ISABELLE_GHC_SETUP=true" +
    8.18              " -e ISABELLE_SMLNJ=/usr/local/smlnj-110.81/bin/sml",
    8.19            args = "-a",
    8.20            detect = Build_Log.Settings.ML_PLATFORM + " = " + SQL.string("x86-windows")),
    8.21          Remote_Build("Windows", "vmnipkow9", historic = true, history = 90, self_update = true,
    8.22            options = "-m64 -M4" +
    8.23              " -e ISABELLE_OCAML=ocaml -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_OCAML_SETUP=true" +
    8.24 -            " -e ISABELLE_GHC=/usr/local/ghc-8.0.2/bin/ghc" +
    8.25 +            " -e ISABELLE_GHC_SETUP=true" +
    8.26              " -e ISABELLE_SMLNJ=/usr/local/smlnj-110.81/bin/sml",
    8.27            args = "-a",
    8.28            detect = Build_Log.Settings.ML_PLATFORM + " = " + SQL.string("x86_64-windows")))
    8.29 @@ -315,7 +315,7 @@
    8.30            options = "-m32 -M1x2 -t AFP -P" + n +
    8.31              " -e ISABELLE_GHC=ghc" +
    8.32              " -e ISABELLE_MLTON=mlton" +
    8.33 -            " -e ISABELLE_OCAML=ocaml -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_OCAML_SETUP=true" +
    8.34 +            " -e ISABELLE_OCAML=ocaml -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_OCAMLFIND=ocamlfind" +
    8.35              " -e ISABELLE_SMLNJ=/home/smlnj/bin/sml",
    8.36            args = "-N -X large -X slow",
    8.37            afp = true,
     9.1 --- a/src/Tools/Code/code_ml.ML	Fri Mar 22 19:18:09 2019 +0000
     9.2 +++ b/src/Tools/Code/code_ml.ML	Fri Mar 22 22:37:30 2019 +0100
     9.3 @@ -889,7 +889,7 @@
     9.4          make_destination = fn p => Path.append p (Path.explode "ROOT.ml")
     9.5            (*extension demanded by OCaml compiler*),
     9.6          make_command = fn _ =>
     9.7 -          "\"$ISABELLE_OCAMLFIND\" ocamlopt -w pu -package zarith -linkpkg ROOT.ml"},
     9.8 +          "\"$ISABELLE_OCAMLFIND\" ocamlopt -w pu -package zarith -linkpkg ROOT.ml </dev/null"},
     9.9        evaluation_args = []})
    9.10    #> Code_Target.set_printings (Type_Constructor ("fun",
    9.11      [(target_SML, SOME (2, fun_syntax)), (target_OCaml, SOME (2, fun_syntax))]))