Extract widely used modules to common dune library

goblint · Oct 5, 2023 · d723fde · d723fde
1 parent 7b76751
commit d723fde
Show file tree

Hide file tree

Showing 34 changed files with 29 additions and 2 deletions.
diff --git a/src/util/afterConfig.ml → src/common/afterConfig.ml b/src/util/afterConfig.ml → src/common/afterConfig.ml
diff --git a/src/framework/analysisState.ml → src/common/analysisState.ml b/src/framework/analysisState.ml → src/common/analysisState.ml
diff --git a/src/cdomains/basetype.ml → src/common/basetype.ml b/src/cdomains/basetype.ml → src/common/basetype.ml
diff --git a/src/util/cilType.ml → src/common/cilType.ml b/src/util/cilType.ml → src/common/cilType.ml
diff --git a/src/util/cilfacade.ml → src/common/cilfacade.ml b/src/util/cilfacade.ml → src/common/cilfacade.ml
diff --git a/src/util/cilfacade0.ml → src/common/cilfacade0.ml b/src/util/cilfacade0.ml → src/common/cilfacade0.ml
diff --git a/src/framework/controlSpecC.ml → src/common/controlSpecC.ml b/src/framework/controlSpecC.ml → src/common/controlSpecC.ml
diff --git a/src/framework/controlSpecC.mli → src/common/controlSpecC.mli b/src/framework/controlSpecC.mli → src/common/controlSpecC.mli
diff --git a/src/common/dune b/src/common/dune
@@ -0,0 +1,28 @@
+(include_subdirs no)
+
+(library
+ (name goblint_common)
+ (public_name goblint.common)
+ (wrapped false) ; TODO: wrap
+ (libraries
+   batteries
+   zarith
+   goblint_std
+   goblint-cil
+   fpath
+   yojson
+   json-data-encoding
+   cpu
+   goblint_timing
+   goblint_build_info
+   goblint.sites
+   qcheck-core.runner)
+ (flags :standard -open Goblint_std)
+ (preprocess
+  (pps
+    ppx_deriving.std
+    ppx_deriving_hash
+    ppx_deriving_yojson
+    ppx_blob))
+ (preprocessor_deps (file options.schema.json)))
+
diff --git a/src/framework/edge.ml → src/common/edge.ml b/src/framework/edge.ml → src/common/edge.ml
diff --git a/src/util/gobConfig.ml → src/common/gobConfig.ml b/src/util/gobConfig.ml → src/common/gobConfig.ml
diff --git a/src/util/gobFormat.ml → src/common/gobFormat.ml b/src/util/gobFormat.ml → src/common/gobFormat.ml
diff --git a/src/util/jsonSchema.ml → src/common/jsonSchema.ml b/src/util/jsonSchema.ml → src/common/jsonSchema.ml
diff --git a/src/domains/lattice.ml → src/common/lattice.ml b/src/domains/lattice.ml → src/common/lattice.ml
diff --git a/src/util/lazyEval.ml → src/common/lazyEval.ml b/src/util/lazyEval.ml → src/common/lazyEval.ml
diff --git a/src/util/messageCategory.ml → src/common/messageCategory.ml b/src/util/messageCategory.ml → src/common/messageCategory.ml
diff --git a/src/util/messageUtil.ml → src/common/messageUtil.ml b/src/util/messageUtil.ml → src/common/messageUtil.ml
diff --git a/src/util/messages.ml → src/common/messages.ml b/src/util/messages.ml → src/common/messages.ml
diff --git a/src/framework/myCFG.ml → src/common/myCFG.ml b/src/framework/myCFG.ml → src/common/myCFG.ml
diff --git a/src/domains/myCheck.ml → src/common/myCheck.ml b/src/domains/myCheck.ml → src/common/myCheck.ml
diff --git a/src/framework/node.ml → src/common/node.ml b/src/framework/node.ml → src/common/node.ml
diff --git a/src/framework/node0.ml → src/common/node0.ml b/src/framework/node0.ml → src/common/node0.ml
diff --git a/src/util/options.ml → src/common/options.ml b/src/util/options.ml → src/common/options.ml
diff --git a/src/util/options.schema.json → src/common/options.schema.json b/src/util/options.schema.json → src/common/options.schema.json
diff --git a/src/domains/printable.ml → src/common/printable.ml b/src/domains/printable.ml → src/common/printable.ml
diff --git a/src/util/resettableLazy.ml → src/common/resettableLazy.ml b/src/util/resettableLazy.ml → src/common/resettableLazy.ml
diff --git a/src/util/resettableLazy.mli → src/common/resettableLazy.mli b/src/util/resettableLazy.mli → src/common/resettableLazy.mli
diff --git a/src/util/richVarinfo.ml → src/common/richVarinfo.ml b/src/util/richVarinfo.ml → src/common/richVarinfo.ml
diff --git a/src/util/richVarinfo.mli → src/common/richVarinfo.mli b/src/util/richVarinfo.mli → src/common/richVarinfo.mli
diff --git a/src/util/timing.ml → src/common/timing.ml b/src/util/timing.ml → src/common/timing.ml
diff --git a/src/util/tracing.ml → src/common/tracing.ml b/src/util/tracing.ml → src/common/tracing.ml
diff --git a/src/incremental/updateCil0.ml → src/common/updateCil0.ml b/src/incremental/updateCil0.ml → src/common/updateCil0.ml
diff --git a/src/util/xmlUtil.ml → src/common/xmlUtil.ml b/src/util/xmlUtil.ml → src/common/xmlUtil.ml
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 goblint_std
+  (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 goblint_common
     ; 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.
@@ -61,7 +61,6 @@
   (ocamlopt_flags :standard -no-float-const-prop)
   (preprocess
     (pps ppx_deriving.std ppx_deriving_hash ppx_deriving_yojson ppx_blob))
-  (preprocessor_deps (file util/options.schema.json))
   (instrumentation (backend bisect_ppx))
 )