# HG changeset patch
# User Peter Lammich
# Date 1608213097 0
# Node ID b945880827ff92e892ddcd1ac55ca39022a62d3a
# Parent  8b92a2ab53703e4fef79a2ba39c49e3cd473a477# Parent  461327d0ad163eb5776e451fb52b60110810416a
merged

diff -r 8b92a2ab5370 -r b945880827ff etc/settings
--- a/etc/settings	Thu Dec 17 13:51:22 2020 +0000
+++ b/etc/settings	Thu Dec 17 13:51:37 2020 +0000
@@ -150,7 +150,7 @@
 
 ISABELLE_OPAM_ROOT="$USER_HOME/.opam"
 
-ISABELLE_OCAML_VERSION="ocaml-base-compiler.4.05.0"
+ISABELLE_OCAML_VERSION="ocaml-base-compiler.4.07.0"
 
 
 ###
diff -r 8b92a2ab5370 -r b945880827ff src/Pure/Admin/build_vampire.scala
--- a/src/Pure/Admin/build_vampire.scala	Thu Dec 17 13:51:22 2020 +0000
+++ b/src/Pure/Admin/build_vampire.scala	Thu Dec 17 13:51:37 2020 +0000
@@ -29,6 +29,8 @@
     progress: Progress = new Progress,
     target_dir: Path = Path.current)
   {
+    Isabelle_System.require_command("git", "cmake")
+
     Isabelle_System.with_tmp_dir("build")(tmp_dir =>
     {
       /* component and platform */
diff -r 8b92a2ab5370 -r b945880827ff src/Pure/Admin/build_zipperposition.scala
--- a/src/Pure/Admin/build_zipperposition.scala	Thu Dec 17 13:51:22 2020 +0000
+++ b/src/Pure/Admin/build_zipperposition.scala	Thu Dec 17 13:51:37 2020 +0000
@@ -9,7 +9,7 @@
 
 object Build_Zipperposition
 {
-  val default_version = "1.6"
+  val default_version = "2.0"
 
 
   /* build Zipperposition */
@@ -22,7 +22,7 @@
   {
     Isabelle_System.with_tmp_dir("build")(build_dir =>
     {
-      Isabelle_System.require_command("patchelf")
+      if (!Platform.is_windows) Isabelle_System.require_command("patchelf")
 
 
       /* component */
@@ -60,8 +60,10 @@
       val exe_path = prg_path.platform_exe
       File.copy(build_dir + Path.basic("bin") + prg_path, platform_dir + exe_path)
 
-      Executable.libraries_closure(
-        platform_dir + exe_path, filter = Set("libgmp"), patchelf = true)
+      if (!Platform.is_windows) {
+        Executable.libraries_closure(
+          platform_dir + exe_path, filter = Set("libgmp"), patchelf = true)
+      }
 
 
       /* settings */