Started geneweb_core lib, included in gwrepl

geneweb · Sep 2, 2021 · 9b7ead4 · 9b7ead4
1 parent 773a946
commit 9b7ead4
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,7 @@ bin/gwrepl/dune
 bin/gwu/dune
 bin/setup/dune
 bin/update_nldb/dune
+lib/core/dune
 lib/dune
 lib/gwdb/dune
 lib/gwdb-legacy-x-arangodb/dune

diff --git a/Makefile b/Makefile
@@ -69,6 +69,7 @@ GENERATED_FILES_DEP = \
 	hd/etc/version.txt \
 	lib/dune \
 	lib/gwdb/dune \
+	lib/core/dune \
 	lib/gwdb-legacy-x-arangodb/dune \
 	lib/gwlib.ml \
 	lib/util/dune \

diff --git a/bin/gwrepl/dune.in b/bin/gwrepl/dune.in
@@ -4,7 +4,9 @@
   (libraries
     stdlib
     str
-    unix geneweb_def
+    unix
+    geneweb_core
+    geneweb_def
     geneweb_util
     geneweb_gwdb
     %%%GWDB_PKG%%%
@@ -23,7 +25,7 @@
  (name gwrepl)
  (public_name gwrepl)
  (link_flags -linkall -custom)
- (libraries compiler-libs.toplevel unix geneweb.gwdb %%%GWDB_PKG%%%)
+ (libraries compiler-libs.toplevel unix)
  (preprocess
   (per_module
    ((action (run %{bin:cppo} %%%CPPO_D%%% %{input-file})) gwrepl_exe)

diff --git a/lib/consang.ml → lib/core/consang.ml b/lib/consang.ml → lib/core/consang.ml
diff --git a/lib/consang.mli → lib/core/consang.mli b/lib/consang.mli → lib/core/consang.mli
diff --git a/lib/consangAll.ml → lib/core/consangAll.ml b/lib/consangAll.ml → lib/core/consangAll.ml
diff --git a/lib/consangAll.mli → lib/core/consangAll.mli b/lib/consangAll.mli → lib/core/consangAll.mli
diff --git a/lib/core/dune.in b/lib/core/dune.in
@@ -0,0 +1,12 @@
+(library
+ (name geneweb_core)
+ (public_name geneweb.core)
+ (wrapped false)
+ (synopsis "GeneWeb Core library")
+ (preprocess (action (run %{bin:cppo} %%%CPPO_D%%% -V OCAML:%{ocaml_version} %{input-file})))
+ (libraries unix
+            geneweb_def
+            geneweb_gwdb
+            geneweb_sosa_mli
+            geneweb_util)
+)
diff --git a/lib/dune.in b/lib/dune.in
@@ -16,12 +16,11 @@
             str
             stdlib-shims
             camlp5
-            geneweb.def
-            geneweb.gwdb
-            geneweb.gwdb_driver
-            geneweb.io
-            geneweb.sosa.mli
-            geneweb.util
+            geneweb_core
+            geneweb_def
+            geneweb_gwdb
+            geneweb_sosa_mli
+            geneweb_util
             markup)
  (modules_without_implementation templAst)
 )
diff --git a/plugins/v7/v7_sosa.ml b/plugins/v7/v7_sosa.ml
@@ -32,7 +32,7 @@ let print_base_loop conf base p =
 let init_sosa_t conf base sosa_ref =
   let tstab =
     try Util.create_topological_sort conf base
-    with Geneweb.Consang.TopologicalSortError p ->
+    with Consang.TopologicalSortError p ->
       let title _ = Output.print_string conf (Utf8.capitalize_fst (transl conf "error")) in
       Hutil.rheader conf title;
       print_base_loop conf base p