Extract most library extensions to std dune library

goblint · Oct 4, 2023 · a840e41 · a840e41
1 parent 093eb5e
commit a840e41
Show file tree

Hide file tree

Showing 17 changed files with 54 additions and 23 deletions.
diff --git a/src/dune b/src/dune
@@ -7,7 +7,7 @@
   (name goblint_lib)
   (public_name goblint.lib)
   (modules :standard \ goblint mainspec privPrecCompare apronPrecCompare messagesCompare)
-  (libraries goblint.sites goblint.build-info goblint-cil.all-features batteries.unthreaded qcheck-core.runner sha json-data-encoding jsonrpc cpu arg-complete fpath yaml yaml.unix uuidm goblint_timing catapult goblint_backtrace fileutils
+  (libraries goblint.sites goblint.build-info goblint-cil.all-features batteries.unthreaded qcheck-core.runner sha json-data-encoding jsonrpc cpu arg-complete fpath yaml yaml.unix uuidm goblint_timing catapult goblint_backtrace fileutils goblint_std
     ; Conditionally compile based on whether apron optional dependency is installed or not.
     ; Alternative dependencies seem like the only way to optionally depend on optional dependencies.
     ; See: https://dune.readthedocs.io/en/stable/concepts.html#alternative-dependencies.
@@ -56,6 +56,7 @@
       (-> violationZ3.no-z3.ml)
     )
   )
+  (flags :standard -open Goblint_std)
   (foreign_stubs (language c) (names stubs))
   (ocamlopt_flags :standard -no-float-const-prop)
   (preprocess
@@ -77,33 +78,33 @@
   (public_names goblint -)
   (modes byte native) ; https://dune.readthedocs.io/en/stable/dune-files.html#linking-modes
   (modules goblint mainspec)
-  (libraries goblint.lib goblint.sites.dune goblint.build-info.dune)
+  (libraries goblint.lib goblint.sites.dune goblint.build-info.dune goblint_std)
   (preprocess (pps ppx_deriving.std ppx_deriving_hash ppx_deriving_yojson))
-  (flags :standard -linkall)
+  (flags :standard -linkall -open Goblint_std)
 )
 
 (executable
   (name privPrecCompare)
   (modules privPrecCompare)
-  (libraries goblint.lib goblint.sites.dune goblint.build-info.dune)
+  (libraries goblint.lib goblint.sites.dune goblint.build-info.dune goblint_std)
   (preprocess (pps ppx_deriving.std ppx_deriving_hash ppx_deriving_yojson))
-  (flags :standard -linkall)
+  (flags :standard -linkall -open Goblint_std)
 )
 
 (executable
   (name apronPrecCompare)
   (modules apronPrecCompare)
-  (libraries goblint.lib goblint.sites.dune goblint.build-info.dune)
+  (libraries goblint.lib goblint.sites.dune goblint.build-info.dune goblint_std)
   (preprocess (pps ppx_deriving.std ppx_deriving_hash ppx_deriving_yojson))
-  (flags :standard -linkall)
+  (flags :standard -linkall -open Goblint_std)
 )
 
 (executable
   (name messagesCompare)
   (modules messagesCompare)
-  (libraries goblint.lib goblint.sites.dune goblint.build-info.dune)
+  (libraries goblint.lib goblint.sites.dune goblint.build-info.dune goblint_std)
   (preprocess (pps ppx_deriving.std ppx_deriving_hash ppx_deriving_yojson))
-  (flags :standard -linkall)
+  (flags :standard -linkall -open Goblint_std)
 )
 
 (rule

diff --git a/src/goblint_lib.ml b/src/goblint_lib.ml
@@ -469,29 +469,18 @@ module ConfigVersion = ConfigVersion
 
 (** {1 Library extensions}
 
-    OCaml library extensions which are completely independent of Goblint. *)
+    OCaml library extensions which are completely independent of Goblint.
+
+    See {!Goblint_std}. *)
 
 (** {2 Standard library}
 
     OCaml standard library extensions which are not provided by {!Batteries}. *)
 
 module GobFormat = GobFormat
-module GobGc = GobGc
-module GobHashtbl = GobHashtbl
-module GobList = GobList
-module GobRef = GobRef
-module GobResult = GobResult
-module GobOption = GobOption
-module GobSys = GobSys
-module GobUnix = GobUnix
 
 (** {2 Other libraries}
 
     External library extensions. *)
 
-module GobFpath = GobFpath
-module GobPretty = GobPretty
-module GobYaml = GobYaml
-module GobYojson = GobYojson
-module GobZ = GobZ
 module MyCheck = MyCheck
diff --git a/src/util/std/dune b/src/util/std/dune
@@ -0,0 +1,17 @@
+(include_subdirs no)
+
+(library
+ (name goblint_std)
+ (public_name goblint.std)
+ (libraries
+   batteries
+   zarith
+   goblint-cil
+   fpath
+   yojson
+   yaml)
+ (preprocess
+  (pps
+   ppx_deriving.std
+   ppx_deriving_hash
+   ppx_deriving_yojson)))
diff --git a/src/util/gobFpath.ml → src/util/std/gobFpath.ml b/src/util/gobFpath.ml → src/util/std/gobFpath.ml
diff --git a/src/util/gobGc.ml → src/util/std/gobGc.ml b/src/util/gobGc.ml → src/util/std/gobGc.ml
diff --git a/src/util/gobHashtbl.ml → src/util/std/gobHashtbl.ml b/src/util/gobHashtbl.ml → src/util/std/gobHashtbl.ml
diff --git a/src/util/gobList.ml → src/util/std/gobList.ml b/src/util/gobList.ml → src/util/std/gobList.ml
diff --git a/src/util/gobOption.ml → src/util/std/gobOption.ml b/src/util/gobOption.ml → src/util/std/gobOption.ml
diff --git a/src/util/gobPretty.ml → src/util/std/gobPretty.ml b/src/util/gobPretty.ml → src/util/std/gobPretty.ml
diff --git a/src/util/gobRef.ml → src/util/std/gobRef.ml b/src/util/gobRef.ml → src/util/std/gobRef.ml
diff --git a/src/util/gobResult.ml → src/util/std/gobResult.ml b/src/util/gobResult.ml → src/util/std/gobResult.ml
diff --git a/src/util/gobSys.ml → src/util/std/gobSys.ml b/src/util/gobSys.ml → src/util/std/gobSys.ml
diff --git a/src/util/gobUnix.ml → src/util/std/gobUnix.ml b/src/util/gobUnix.ml → src/util/std/gobUnix.ml
diff --git a/src/util/gobYaml.ml → src/util/std/gobYaml.ml b/src/util/gobYaml.ml → src/util/std/gobYaml.ml
diff --git a/src/util/gobYojson.ml → src/util/std/gobYojson.ml b/src/util/gobYojson.ml → src/util/std/gobYojson.ml
diff --git a/src/util/gobZ.ml → src/util/std/gobZ.ml b/src/util/gobZ.ml → src/util/std/gobZ.ml
diff --git a/src/util/std/goblint_std.ml b/src/util/std/goblint_std.ml
@@ -0,0 +1,24 @@
+(** OCaml library extensions which are completely independent of Goblint. *)
+
+(** {1 Standard library}
+
+    OCaml standard library extensions which are not provided by {!Batteries}. *)
+
+module GobGc = GobGc
+module GobHashtbl = GobHashtbl
+module GobList = GobList
+module GobRef = GobRef
+module GobResult = GobResult
+module GobOption = GobOption
+module GobSys = GobSys
+module GobUnix = GobUnix
+
+(** {1 Other libraries}
+
+    External library extensions. *)
+
+module GobFpath = GobFpath
+module GobPretty = GobPretty
+module GobYaml = GobYaml
+module GobYojson = GobYojson
+module GobZ = GobZ