Merge pull request #5876 from edwintorok/private/edvint/maintenance2

Reduce build/test times
xapi-project · Jul 24, 2024 · bc549cd · bc549cd
2 parents 1d0aae5 + a6406ea
commit bc549cd
Show file tree

Hide file tree

Showing 155 changed files with 628 additions and 478 deletions.
diff --git a/clock.opam b/clock.opam
@@ -7,7 +7,7 @@ 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/issues"
 depends: [
-  "dune" {>= "3.0"}
+  "dune" {>= "3.15"}
   "ocaml" {>= "4.12"}
   "alcotest" {with-test}
   "astring"

diff --git a/dune b/dune
@@ -3,7 +3,7 @@
     (ocamlopt_flags (:standard -g -p -w -39))
     (flags (:standard -w -39))
   )
-  (dev (flags (:standard -g -w -39)))
+  (dev (flags (:standard -g -w -39 -warn-error -69)))
   (release
     (flags (:standard -w -39-6@5))
     (env-vars (ALCOTEST_COMPACT 1))

diff --git a/dune-project b/dune-project
@@ -1,4 +1,5 @@
-(lang dune 3.0)
+(lang dune 3.15)
+
 (formatting (enabled_for ocaml))
 (using menhir 2.0)
 
@@ -66,7 +67,7 @@
   (synopsis "Xen-API client library for remotely-controlling a xapi host")
   (authors "David Scott" "Anil Madhavapeddy" "Jerome Maloberti" "John Else" "Jon Ludlam" "Thomas Sanders" "Mike McClurg")
   (depends
-   dune-build-info
+
    (alcotest :with-test)
    astring
    (cohttp (>= "0.22.0"))
@@ -187,7 +188,7 @@
   (description "This daemon monitors 'datasources' i.e. time-varying values such as performance counters and records the samples in RRD archives. These archives can be used to examine historical performance trends.")
   (depends
    (ocaml (>= "4.02.0"))
-   dune-build-info
+
    (alcotest :with-test)
    astring
    (gzip (= :version))

diff --git a/forkexec.opam b/forkexec.opam
@@ -8,7 +8,7 @@ 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/issues"
 depends: [
-  "dune" {>= "3.0"}
+  "dune" {>= "3.15"}
   "base-threads"
   "fd-send-recv" {>= "2.0.0"}
   "ppx_deriving_rpc"

diff --git a/http-lib.opam b/http-lib.opam
@@ -9,7 +9,7 @@ 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/issues"
 depends: [
-  "dune" {>= "3.0"}
+  "dune" {>= "3.15"}
   "alcotest" {with-test}
   "astring"
   "base64" {>= "3.1.0"}

diff --git a/message-switch-core.opam b/message-switch-core.opam
@@ -9,7 +9,7 @@ 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/issues"
 depends: [
-  "dune" {>= "3.0"}
+  "dune" {>= "3.15"}
   "astring"
   "cohttp" {>= "0.21.1"}
   "ppx_deriving_rpc"

diff --git a/message-switch-unix.opam b/message-switch-unix.opam
@@ -9,7 +9,7 @@ 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/issues"
 depends: [
-  "dune" {>= "3.0"}
+  "dune" {>= "3.15"}
   "base-threads"
   "cohttp"
   "message-switch-core" {= version}

diff --git a/message-switch.opam b/message-switch.opam
@@ -31,6 +31,7 @@ depends: [
   "ppx_sexp_conv"
   "sexplib"
   "shared-block-ring" {>= "2.3.0"}
+  "xapi-stdext-unix"
 ]
 synopsis: "A simple store-and-forward message switch"
 description: """

diff --git a/message-switch.opam.template b/message-switch.opam.template
@@ -29,6 +29,7 @@ depends: [
   "ppx_sexp_conv"
   "sexplib"
   "shared-block-ring" {>= "2.3.0"}
+  "xapi-stdext-unix"
 ]
 synopsis: "A simple store-and-forward message switch"
 description: """

diff --git a/ocaml/alerts/certificate/dune b/ocaml/alerts/certificate/dune
@@ -1,6 +1,7 @@
 (library
   (name certificate_check)
   (modules certificate_check)
+  (modes best)
   (libraries
     astring
     xapi-expiry-alerts
@@ -19,7 +20,7 @@
   (modules certificate_check_main)
   (libraries
     certificate_check
-    dune-build-info
+
     http_lib
     xapi-client
     xapi-types

diff --git a/ocaml/alerts/dune b/ocaml/alerts/dune
@@ -2,9 +2,7 @@
   (name expiry_alert)
   (public_name xapi-expiry-alerts)
   (libraries
-    astring
     xapi-client
-    xapi-consts
     xapi-types
     xapi-stdext-date
   )

diff --git a/ocaml/auth/dune b/ocaml/auth/dune
@@ -1,4 +1,5 @@
 (library
+  (modes best)
   (foreign_stubs
     (language c)
     (names xa_auth xa_auth_stubs)

diff --git a/ocaml/database/dune b/ocaml/database/dune
@@ -9,14 +9,12 @@
     db_names db_exn schema string_marshall_helper string_unmarshall_helper
     test_schemas)
   (libraries
-    ppx_sexp_conv.runtime-lib
-    sexplib0
     sexpr
     xapi-log
     xapi-stdext-encodings
   )
   (wrapped false)
-  (preprocess (pps ppx_sexp_conv))
+  (preprocess (per_module ((pps ppx_sexp_conv) Schema)))
 )
 
 (library
@@ -50,7 +48,10 @@
     xml-light2
     xmlm
   )
-  (preprocess (pps ppx_deriving_rpc))
+  (preprocess
+    (per_module
+     ((pps ppx_deriving_rpc)
+      Db_cache_types Db_filter_types Db_rpc_common_v2 Db_secret_string)))
 )
 
 (executable
@@ -60,7 +61,7 @@
   (package xapi)
   (modules block_device_io)
   (libraries
-    dune-build-info
+
     xapi_database
     xapi-log
     xapi-stdext-pervasives
@@ -74,7 +75,7 @@
   (modes exe)
   (modules database_server_main)
   (libraries
-    dune-build-info
+
     http_lib
     httpsvr
     threads.posix
@@ -90,10 +91,8 @@
   (package xapi)
   (modules db_cache_test unit_test_marshall)
   (libraries
-    alcotest
-    dune-build-info
+    alcotest    
     http_lib
-    ppx_sexp_conv.runtime-lib
     rpclib.xml
     sexplib
     sexplib0
@@ -112,7 +111,6 @@
   )
   (libraries
     alcotest
-    dune-build-info
     xapi_database
     xml-light2
   )

diff --git a/ocaml/db_process/dune b/ocaml/db_process/dune
@@ -4,7 +4,7 @@
   (public_name xapi-db-process)
   (package xapi)
   (libraries
-    dune-build-info
+
     unix
     xapi-inventory
     xapi_database

diff --git a/ocaml/doc/dune b/ocaml/doc/dune
@@ -1,9 +1,7 @@
 (executable
   (modes exe)
   (name jsapi)
-  (libraries
-    dune-build-info
-    gzip
+  (libraries    
     mustache
     rpclib.core
     rpclib.json

diff --git a/ocaml/events/dune b/ocaml/events/dune
@@ -4,7 +4,6 @@
   (public_name event_listen)
   (package xapi)
   (libraries
-    dune-build-info
     http_lib
     xapi-client
     xapi-types

diff --git a/ocaml/forkexecd/lib/dune b/ocaml/forkexecd/lib/dune
@@ -15,5 +15,4 @@
    xapi-stdext-unix
    xapi-tracing
  )
- (preprocess
-  (pps ppx_deriving_rpc)))
+ (preprocess (per_module ((pps ppx_deriving_rpc) Fe))))
diff --git a/ocaml/gencert/dune b/ocaml/gencert/dune
@@ -2,6 +2,7 @@
   (name gencertlib)
   (wrapped true)
   (modules lib selfcert pem)
+  (modes best)
   (libraries
     angstrom
     astring
@@ -31,7 +32,6 @@
   (modules gencert)
   (libraries
     astring
-    dune-build-info
     gencertlib
     x509
     xapi-inventory
@@ -48,7 +48,6 @@
   (libraries
     alcotest
     cstruct
-    dune-build-info
     fmt
     gencertlib
     mirage-crypto

diff --git a/ocaml/idl/autogen/dune b/ocaml/idl/autogen/dune
@@ -3,4 +3,4 @@
   (deps
     (source_tree .)
   )
-)
+)
diff --git a/ocaml/idl/dune b/ocaml/idl/dune
@@ -8,7 +8,6 @@
     datamodel_diagnostics datamodel_repository datamodel_lifecycle
     datamodel_vtpm datamodel_observer datamodel_vm_group)
   (libraries
-    ppx_sexp_conv.runtime-lib
     rpclib.core
     sexplib0
     sexpr
@@ -18,18 +17,16 @@
     xapi-schema
     xapi-stdext-date
     xapi-stdext-std
-    xapi-stdext-unix
   )
   (wrapped false)
-  (preprocess (pps ppx_deriving_rpc))
+  (preprocess (per_module ((pps ppx_deriving_rpc) Datamodel_types)))
 )
 
 (executable
   (modes exe)
   (name datamodel_main)
   (modules datamodel_main dot_backend dtd_backend markdown_backend)
   (libraries
-    dune-build-info
     mustache
     xapi-datamodel
     xapi-stdext-std
@@ -53,7 +50,6 @@
   (modes exe)
   (modules schematest)
   (libraries
-    dune-build-info
     rpclib.core
     rpclib.json
     xapi_datamodel
@@ -67,8 +63,7 @@
   (public_name gen_lifecycle)
   (package xapi-datamodel)
   (modules gen_lifecycle)
-  (libraries
-    dune-build-info
+  (libraries    
     xapi-datamodel
     xapi-consts.xapi_version
   )

diff --git a/ocaml/idl/json_backend/dune b/ocaml/idl/json_backend/dune
@@ -1,8 +1,7 @@
 (executable
   (modes exe)
   (name gen_json)
-  (libraries
-    dune-build-info
+  (libraries    
     fmt
     xapi-datamodel
     xapi-consts

diff --git a/ocaml/idl/ocaml_backend/dune b/ocaml/idl/ocaml_backend/dune
@@ -1,15 +1,12 @@
 (executable
-  (modes exe)
+  (modes byte)
   (name gen_api_main)
   (libraries
     astring
-    dune-build-info
-    sexpr
-    uuid
+    uuidm
     xapi-consts
     xapi-datamodel
     xapi-log
-    xapi-stdext-pervasives
     xapi-stdext-std
   )
 )

diff --git a/ocaml/idl/ocaml_backend/gen_api.ml b/ocaml/idl/ocaml_backend/gen_api.ml
@@ -412,7 +412,6 @@ let gen_client_types highapi =
        ; gen_record_type ~with_module:true highapi
            (toposort_types highapi all_types)
        ; gen_enum_helpers all_types
-       ; O.Signature.strings_of (Gen_client.gen_signature highapi)
        ]
     )
 

diff --git a/ocaml/idl/ocaml_backend/gen_rbac.ml b/ocaml/idl/ocaml_backend/gen_rbac.ml
@@ -57,7 +57,7 @@ let writer_csv static_permissions_roles =
 
 let hash2uuid str =
   let h = Digest.string str in
-  Option.map Uuidx.to_string (Uuidx.of_bytes h)
+  Option.map Uuidm.to_string (Uuidm.of_bytes h)
 
 let replace_char str c1 c2 =
   let buf = Bytes.of_string str in

diff --git a/ocaml/libs/clock/dune b/ocaml/libs/clock/dune
@@ -3,7 +3,6 @@
   (public_name clock)
   (modules date timer)
   (libraries
-    astring
     fmt
     (re_export mtime)
     mtime.clock.os

diff --git a/ocaml/libs/http-lib/dune b/ocaml/libs/http-lib/dune
@@ -60,7 +60,7 @@
   (modules http_test radix_tree_test)
   (libraries
     alcotest
-    dune-build-info
+
     fmt
     http_lib
   )
@@ -97,7 +97,7 @@
   (name test_client)
   (modules test_client)
   (libraries
-    dune-build-info
+
     http_lib
     safe-resources
     stunnel
@@ -112,7 +112,7 @@
   (name test_server)
   (modules test_server)
   (libraries
-    dune-build-info
+
     http_lib
     httpsvr
     safe-resources

diff --git a/ocaml/libs/log/dune b/ocaml/libs/log/dune
@@ -11,7 +11,6 @@
    logs
    threads.posix
    xapi-backtrace
-   xapi-stdext-pervasives
  )
  (wrapped false)
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,4 @@ @@
       (deps
         (source_tree .)
       )
-    )
+    )