Force one of the backend to be installed by opam

Reverse dependency ocsipersist and backend
ocsigen · May 22, 2024 · b14ede1 · b14ede1
1 parent c645302
commit b14ede1
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 13 deletions.
diff --git a/ocsipersist-dbm.opam b/ocsipersist-dbm.opam
@@ -16,7 +16,6 @@ depends: [
   "dune" {>= "2.9"}
   "lwt" {>= "4.2.0"}
   "lwt_log"
-  "ocsipersist" {>= "2.0.0" & < "2.1.0"}
   "ocsipersist-lib" {>= "2.0.0" & < "2.1.0"}
   "dbm"
 ]
diff --git a/ocsipersist-pgsql.opam b/ocsipersist-pgsql.opam
@@ -16,7 +16,6 @@ depends: [
   "dune" {>= "2.9"}
   "lwt" {>= "4.2.0"}
   "lwt_log"
-  "ocsipersist" {>= "2.0.0" & < "2.1.0"}
   "ocsipersist-lib" {>= "2.0.0" & < "2.1.0"}
   "pgocaml"
 ]
diff --git a/ocsipersist-sqlite.opam b/ocsipersist-sqlite.opam
@@ -16,7 +16,6 @@ depends: [
   "dune" {>= "2.9"}
   "lwt" {>= "4.2.0"}
   "lwt_log"
-  "ocsipersist" {>= "2.0.0" & < "2.1.0"}
   "ocsipersist-lib" {>= "2.0.0" & < "2.1.0"}
   "sqlite3"
 ]
diff --git a/ocsipersist.opam b/ocsipersist.opam
@@ -16,6 +16,7 @@ depends: [
   "dune" {>= "2.9"}
   "lwt" {>= "4.2.0"}
   "ocsipersist-lib" {>= "2.0.0" & < "3.0.0"}
+  ("ocsipersist-sqlite" | "ocsipersist-pgsql" | "ocsipersist-dbm")
 ]
 conflicts: [
 	"ocsipersist-dbm" {< "2.0.0" | >= "2.1.0"}

diff --git a/src/dbm/dune b/src/dbm/dune
@@ -7,9 +7,9 @@
 
 (library
  (name ocsipersist_dbm)
- (public_name ocsipersist-dbm)
+ (public_name ocsipersist.dbm)
  (implements ocsipersist)
- (modules ocsipersist ocsipersist_settings)
+ (modules :standard \ ocsipersist_config ocsidbm ocsidbmtypes)
  (libraries dbm lwt_log ocsipersist_dbmtypes ocsipersist_lib))
 
 (library

diff --git a/src/dbm/index.mld b/src/dbm/index.mld
@@ -21,7 +21,7 @@ Here we document the configuration options of the ocsigenserver extension.
 All sub-tags of the [extension] tag are optional.
 
 {[
-<extension findlib-package="ocsipersist.dbm.config">
+<extension findlib-package="ocsipersist-dbm-config">
   <delayloading val="false"/>
   <store dir="store"/>
   <ocsidbm name="ocsidbm"/>

diff --git a/src/pgsql/dune b/src/pgsql/dune
@@ -1,8 +1,8 @@
 (library
  (name ocsipersist_pgsql)
- (public_name ocsipersist-pgsql)
+ (public_name ocsipersist.pgsql)
  (implements ocsipersist)
- (modules ocsipersist ocsipersist_settings)
+ (modules :standard \ ocsipersist_config)
  (libraries pgocaml lwt_log ocsipersist_lib))
 
 (library

diff --git a/src/pgsql/index.mld b/src/pgsql/index.mld
@@ -23,7 +23,7 @@ All attributes of the [database] tag are optional.
 
 One can either define a host to connect to:
 {[
-<extension findlib-package="ocsipersist.pgsql.config">
+<extension findlib-package="ocsipersist-pgsql-config">
   <database
      host="localhost"
      port="3000"
@@ -36,7 +36,7 @@ One can either define a host to connect to:
 
 Or a UNIX domain socket:
 {[
-<extension findlib-package="ocsipersist.pgsql.config">
+<extension findlib-package="ocsipersist-pgsql-config">
   <database
     unix_domain_socket_dir = "pgsql_socket"
     user="ocsipersist"

diff --git a/src/sqlite/dune b/src/sqlite/dune
@@ -1,8 +1,8 @@
 (library
  (name ocsipersist_sqlite)
- (public_name ocsipersist-sqlite)
+ (public_name ocsipersist.sqlite)
  (implements ocsipersist)
- (modules ocsipersist ocsipersist_settings)
+ (modules :standard \ ocsipersist_config)
  (libraries sqlite3 lwt_log ocsipersist_lib))
 
 (library

diff --git a/src/sqlite/index.mld b/src/sqlite/index.mld
@@ -16,7 +16,7 @@ use the following configuration tags.
 All sub-tags of the [extension] tag are optional.
 
 {[
-<extension findlib-package="ocsipersist.sqlite.config">
+<extension findlib-package="ocsipersist-sqlite-config">
   <database file="data/ocsidb"/>
 </extension>
 ]}