opam: generate xapi-log with dune (#6532)

And remove the testing dependency to threadext to avoid a circular
dependency

Author: psafont

dune-project

@@ -221,7 +221,17 @@
  (name xapi-nbd))
 
 (package
- (name xapi-log))
+ (name xapi-log)
+ (synopsis "A Logs library required by xapi")
+ (description
+  "This package is provided for backwards compatibility only. No new package should use it.")
+ (depends
+  astring
+  fmt
+  logs
+  mtime
+  xapi-backtrace
+  (xapi-stdext-pervasives (= :version))))
 
 (package
  (name xapi-idl))

ocaml/libs/log/test/dune

@@ -1,6 +1,6 @@
 (executable
  (name log_test)
- (libraries log xapi-stdext-threads threads.posix xapi-backtrace))
+ (libraries log threads.posix xapi-backtrace))
 
 (cram
  (package xapi-log)

ocaml/libs/log/test/log_test.ml

@@ -6,12 +6,16 @@ let a = [||]
 
 let buggy () = a.(1) <- 0
 
+let with_lock mutex f =
+  let finally () = Mutex.unlock mutex in
+  Mutex.lock mutex ; Fun.protect ~finally f
+
 let () =
   Printexc.record_backtrace true ;
   Debug.log_to_stdout () ;
   ()
   |> Debug.with_thread_associated "main" @@ fun () ->
-     try Xapi_stdext_threads.Threadext.Mutex.execute m buggy
+     try with_lock m buggy
      with e ->
        D.log_backtrace e ;
        D.warn "Got exception: %s" (Printexc.to_string e)

ocaml/libs/log/test/log_test.t

@@ -3,7 +3,7 @@
   [|error||0 |main|backtrace] 1/4 log_test.exe Raised at file ocaml/libs/log/test/log_test.ml, line 7
   [|error||0 |main|backtrace] 2/4 log_test.exe Called from file fun.ml, line 33
   [|error||0 |main|backtrace] 3/4 log_test.exe Called from file fun.ml, line 38
-  [|error||0 |main|backtrace] 4/4 log_test.exe Called from file ocaml/libs/log/test/log_test.ml, line 14
+  [|error||0 |main|backtrace] 4/4 log_test.exe Called from file ocaml/libs/log/test/log_test.ml, line 18
   [|error||0 |main|backtrace] 
   [| warn||0 |main|log_test.ml] Got exception: Invalid_argument("index out of bounds")
 

opam/xapi-log.opam

@@ -1,31 +1,35 @@
 # This file is generated by dune, edit dune-project instead
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
-maintainer: "[email protected]"
-authors: "[email protected]"
+synopsis: "A Logs library required by xapi"
+description:
+  "This package is provided for backwards compatibility only. No new package should use it."
+maintainer: ["Xapi project maintainers"]
+authors: ["[email protected]"]
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 homepage: "https://xapi-project.github.io/"
-bug-reports: "https://github.com/xapi-project/xen-api.git"
-dev-repo: "git+https://github.com/xapi-project/xen-api.git"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-available: [ os = "linux" ]
+bug-reports: "https://github.com/xapi-project/xen-api/issues"
 depends: [
-  "ocaml"
   "dune" {>= "3.15"}
   "astring"
   "fmt"
   "logs"
   "mtime"
   "xapi-backtrace"
-  "xapi-stdext-pervasives"
+  "xapi-stdext-pervasives" {= version}
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
 ]
-synopsis: "Library required by xapi"
-description: """
-These libraries are provided for backwards compatibility only.
-No new code should use these libraries."""
-url {
-  src:
-    "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
-}
+dev-repo: "git+https://github.com/xapi-project/xen-api.git"