updated to kodkodi-1.5.7. with more robust/portable management of files and processes;
--- a/Admin/components/components.sha1 Thu Oct 07 14:02:18 2021 +0200
+++ b/Admin/components/components.sha1 Thu Oct 07 20:53:24 2021 +0200
@@ -253,6 +253,7 @@
3ecdade953bb455ed2907952be287d7e5cf6533b kodkodi-1.5.5.tar.gz
8aa939f5127290eb9a99952d375be9ffbf90c43b kodkodi-1.5.6-1.tar.gz
6b12bf3f40b16fae8ff22aa39171fa018d107cb3 kodkodi-1.5.6.tar.gz
+c8b2e632f3ab959a4e037833a45e6360c8b72a99 kodkodi-1.5.7.tar.gz
377e36efb8608e6c828c7718d890e97fde2006a4 linux_app-20131007.tar.gz
759848095e2ad506083d92b5646947e3c32f27a0 linux_app-20191223.tar.gz
1a449ce69ac874e21804595d16aaaf5a0d0d0c10 linux_app-20200110.tar.gz
--- a/Admin/components/main Thu Oct 07 14:02:18 2021 +0200
+++ b/Admin/components/main Thu Oct 07 20:53:24 2021 +0200
@@ -13,7 +13,7 @@
jedit-20210802
jfreechart-1.5.3
jortho-1.0-2
-kodkodi-1.5.6-1
+kodkodi-1.5.7
minisat-2.2.1
nunchaku-0.5
opam-2.0.7
--- a/src/HOL/Tools/Nitpick/kodkod.scala Thu Oct 07 14:02:18 2021 +0200
+++ b/src/HOL/Tools/Nitpick/kodkod.scala Thu Oct 07 20:53:24 2021 +0200
@@ -11,7 +11,7 @@
import java.util.concurrent.{TimeUnit, LinkedBlockingQueue, ThreadPoolExecutor}
import org.antlr.runtime.{ANTLRInputStream, RecognitionException}
-import de.tum.in.isabelle.Kodkodi.{Context, KodkodiLexer, KodkodiParser}
+import isabelle.kodkodi.{Context, KodkodiLexer, KodkodiParser}
object Kodkod
--- a/src/HOL/Tools/Nitpick/kodkod_sat.ML Thu Oct 07 14:02:18 2021 +0200
+++ b/src/HOL/Tools/Nitpick/kodkod_sat.ML Thu Oct 07 20:53:24 2021 +0200
@@ -52,16 +52,11 @@
fun dynamic_entry_for_external name dev home exec args markers =
let
fun make_args () =
- let
- val serial_str = serial_string ()
- val base = name ^ serial_str
- val out_file = base ^ ".out"
- val exe = Path.variable home + Path.platform_exe (Path.basic exec)
- in
- [if null markers then "External" else "ExternalV2"] @
- [File.platform_path exe, base ^ ".cnf"] @
- (if null markers then [] else [if dev = ToFile then out_file else ""]) @ markers @
- (if dev = ToFile then [out_file] else []) @ args
+ let val inpath = name ^ serial_string () ^ ".cnf" in
+ [if null markers then "External" else "ExternalV2"] @
+ [File.platform_path (Path.variable home + Path.platform_exe (Path.basic exec))] @
+ [inpath] @ (if null markers then [] else [if dev = ToFile then "out" else ""]) @
+ markers @ args
end
in if getenv home = "" then NONE else SOME (name, make_args) end