Vendor progress lib

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "vendor/progress"]
+	path = vendor/progress
+	url = https://github.com/Gbury/progress.git

dolmen_bin.opam

@@ -14,15 +14,14 @@ depends: [
   "dolmen_type" {= version }
   "dolmen_loop" {= version }
   "dolmen_model" {= version }
+  "odoc" { with-doc }
   "dune" { >= "3.0" }
   "fmt"
   "cmdliner" { >= "1.1.0" }
-  "odoc" { with-doc }
-  "progress"
-  "terminal"
-]
-pin-depends: [
-  [ "progress" "git+https://github.com/Gbury/progress.git#custom" ]
+  "pp_loc" { >= "2.0.0" }
+# These two are currently vendored
+#  "progress"
+#  "terminal"
 ]
 depopts: [
   "memtrace"

dolmen_loop.opam

@@ -15,7 +15,6 @@ depends: [
   "dune" { >= "3.0" }
   "gen"
   "odoc" { with-doc }
-  "pp_loc" { >= "2.0.0" }
 ]
 tags: [ "logic" "computation" "automated theorem prover" ]
 homepage: "https://github.com/Gbury/dolmen"

dune

@@ -1,3 +1,6 @@
+; directory for vendored libs
+(vendored_dirs vendor)
+
 (env
   ; Ensure no inlinging takes place in dev mode to have more accurate backtraces
   (dev (ocamlopt_flags :standard -inline 0))

src/bin/dune

@@ -6,6 +6,8 @@
   (libraries
     ; external deps
     cmdliner fmt gen
+    pp_loc progress terminal
+    mtime mtime.clock.os
     ; dolmen deps
     dolmen dolmen.intf dolmen.std
     dolmen_type dolmen_loop dolmen_model

src/bin/main.ml

@@ -32,9 +32,10 @@ let finally st e =
   | None -> st
   | Some (bt,exn) ->
     (* Print the backtrace if requested *)
-    if State.(get bt) st then (
-      (* TODO: use Tui *)
-      Printexc.print_raw_backtrace stdout bt);
+    if State.(get bt) st then begin
+      Tui.eprintf "%s@."
+        (Printexc.raw_backtrace_to_string bt)
+    end;
     handle_exn st exn
 
 let run st =

src/loop/dune

@@ -4,7 +4,7 @@
   (instrumentation (backend bisect_ppx))
   (libraries
     ; External deps
-    gen unix fmt pp_loc terminal progress
+    gen unix fmt
     ; main dolmen deps, with versioned languages deps
     dolmen
     dolmen.intf dolmen.std dolmen.class