Merge pull request #1549 from goblint/rm-virtual-library

Unvirtualize goblint.build-info and goblint.sites
goblint · Nov 29, 2024 · 8e6ecbb · 8e6ecbb
2 parents 393f897 + 6039b1d
commit 8e6ecbb
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 67 deletions.
diff --git a/gobview b/gobview
diff --git a/src/build-info/build_info_dune/dune b/src/build-info/build_info_dune/dune
diff --git a/src/build-info/build_info_js/dune b/src/build-info/build_info_js/dune
diff --git a/src/build-info/build_info_js/dune_build_info.ml b/src/build-info/build_info_js/dune_build_info.ml
diff --git a/src/build-info/dune b/src/build-info/dune
@@ -1,14 +1,9 @@
 (include_subdirs no)
 
-; virtual library to allow js build (for gobview) without dune-build-info
-; dune-build-info seems to be incompatible with js_of_ocaml
-; File "gobview/src/.App.eobjs/build_info_data.ml-gen", line 1:
-; Error: Could not find the .cmi file for interface
-;        gobview/src/.App.eobjs/build_info_data.ml-gen.
 (library
   (name goblint_build_info)
   (public_name goblint.build-info)
-  (virtual_modules dune_build_info))
+  (libraries dune-build-info))
 
 (rule
   (target configVersion.ml)

diff --git a/...d-info/build_info_dune/dune_build_info.ml → src/build-info/dune_build_info.ml b/...d-info/build_info_dune/dune_build_info.ml → src/build-info/dune_build_info.ml
diff --git a/src/dune b/src/dune
@@ -88,31 +88,31 @@
   (public_names goblint)
   (modes byte native) ; https://dune.readthedocs.io/en/stable/dune-files.html#linking-modes
   (modules goblint)
-  (libraries goblint.lib goblint.sites.dune goblint.build-info.dune goblint_std)
+  (libraries goblint.lib goblint_std)
   (preprocess (pps ppx_deriving.std ppx_deriving_hash ppx_deriving_yojson))
   (flags :standard -linkall -open Goblint_std)
 )
 
 (executable
   (name privPrecCompare)
   (modules privPrecCompare)
-  (libraries goblint.lib goblint.sites.dune goblint.build-info.dune goblint_std)
+  (libraries goblint.lib goblint_std)
   (preprocess (pps ppx_deriving.std ppx_deriving_hash ppx_deriving_yojson))
   (flags :standard -linkall -open Goblint_std)
 )
 
 (executable
   (name apronPrecCompare)
   (modules apronPrecCompare)
-  (libraries goblint.lib goblint.sites.dune goblint.build-info.dune goblint_std)
+  (libraries goblint.lib goblint_std)
   (preprocess (pps ppx_deriving.std ppx_deriving_hash ppx_deriving_yojson))
   (flags :standard -linkall -open Goblint_std)
 )
 
 (executable
   (name messagesCompare)
   (modules messagesCompare)
-  (libraries goblint.lib goblint.sites.dune goblint.build-info.dune goblint_std)
+  (libraries goblint.lib goblint_std)
   (preprocess (pps ppx_deriving.std ppx_deriving_hash ppx_deriving_yojson))
   (flags :standard -linkall -open Goblint_std)
 )

diff --git a/src/index.mld b/src/index.mld
@@ -44,15 +44,9 @@ The following libraries provide [goblint] package metadata for executables.
 
 {2 Library goblint.build-info}
 {!modules:Goblint_build_info}
-This library is virtual and has the following implementations
-- goblint.build-info.dune for native executables,
-- goblint.build-info.js for js_of_ocaml executables.
 
 {2 Library goblint.sites}
 {!modules:Goblint_sites}
-This library is virtual and has the following implementations
-- goblint.sites.dune for native executables,
-- goblint.sites.js for js_of_ocaml executables.
 
 
 {1 Independent utilities}

diff --git a/src/sites/dune b/src/sites/dune
@@ -1,12 +1,10 @@
 (include_subdirs no)
 
-; virtual library to allow js build (for gobview) without dune-site
-; dune-site seems to be incompatible with js_of_ocaml
-;  File "gobview/src/.App.eobjs/dune_site_data.ml-gen", line 1:
-;  Error: Could not find the .cmi file for interface
-;        gobview/src/.App.eobjs/dune_site_data.ml-gen.
 (library
   (name goblint_sites)
   (public_name goblint.sites)
-  (virtual_modules goblint_sites)
-  (libraries fpath))
+  (libraries dune-site fpath))
+
+(generate_sites_module
+  (module dunesite)
+  (sites goblint))
diff --git a/src/sites/sites_dune/goblint_sites.ml → src/sites/goblint_sites.ml b/src/sites/sites_dune/goblint_sites.ml → src/sites/goblint_sites.ml
diff --git a/src/sites/sites_dune/dune b/src/sites/sites_dune/dune
diff --git a/src/sites/sites_js/dune b/src/sites/sites_js/dune
diff --git a/src/sites/sites_js/goblint_sites.ml b/src/sites/sites_js/goblint_sites.ml
diff --git a/tests/regression/cfg/util/dune b/tests/regression/cfg/util/dune
@@ -5,7 +5,5 @@
    goblint_logs
    goblint_common
    goblint_lib ; TODO: avoid: extract LoopUnrolling and WitnessUtil node predicates from goblint_lib
-   fpath
-   goblint.sites.dune
-   goblint.build-info.dune)
+   fpath)
  (preprocess (pps ppx_deriving.std)))
diff --git a/tests/unit/dune b/tests/unit/dune
@@ -2,7 +2,7 @@
 
 (test
   (name mainTest)
-  (libraries ounit2 qcheck-ounit goblint.std goblint.common goblint.lib goblint.constraint goblint.solver goblint.cdomain.value goblint.sites.dune goblint.build-info.dune)
+  (libraries ounit2 qcheck-ounit goblint.std goblint.common goblint.lib goblint.constraint goblint.solver goblint.cdomain.value)
   (preprocess (pps ppx_deriving.std ppx_deriving_hash ppx_deriving_yojson))
   (flags :standard -linkall))
 

diff --git a/tests/util/dune b/tests/util/dune
@@ -5,9 +5,7 @@
    goblint-cil
    goblint_std
    goblint_lib
-   yaml
-   goblint.sites.dune
-   goblint.build-info.dune)
+   yaml)
  (flags :standard -open Goblint_std)
  (preprocess (pps ppx_deriving.std)))