Begin factoring out Lwt_ssl, Lwt_glib, Lwt_react

_oasis

@@ -200,7 +200,7 @@ Library "lwt-react"
   Path: src/react
   Modules: Lwt_react
   BuildDepends: lwt, react
-  XMETADescription: Reactive programming helpers for Lwt
+  XMETADescription: Reactive programming helpers for Lwt (deprecated; use package lwt_react)
 
 Library "lwt-preemptive"
   Build$: flag(preemptive) || flag(all)
@@ -221,7 +221,7 @@ Library "lwt-glib"
   Modules: Lwt_glib
   CSources: lwt_glib_stubs.c
   BuildDepends: lwt, lwt.unix
-  XMETADescription: Glib integration for Lwt
+  XMETADescription: Glib integration for Lwt (deprecated; use package lwt_glib)
 
 Library "lwt-ssl"
   Build$: flag(ssl) || flag(all)
@@ -231,7 +231,7 @@ Library "lwt-ssl"
   Path: src/ssl
   Modules: Lwt_ssl
   BuildDepends: ssl, lwt.unix
-  XMETADescription: SSL support for Lwt
+  XMETADescription: SSL support for Lwt (deprecated; use package lwt_ssl)
 
 Library "lwt-syntax"
   Build$: flag(camlp4) || flag(all)

lwt_glib.opam

@@ -0,0 +1,22 @@
+opam-version: "1.2"
+name: "lwt_glib"
+version: "dev"
+maintainer: "Anton Bachin <[email protected]>"
+authors: [
+  "Jérémie Dimino"
+]
+homepage: "https://github.com/ocsigen/lwt"
+doc: "https://ocsigen.org/lwt/manual/"
+dev-repo: "https://github.com/ocsigen/lwt.git"
+bug-reports: "https://github.com/ocsigen/lwt/issues"
+license: "LGPL with OpenSSL linking exception"
+install: [
+    ["ocamlfind" "install" "lwt_glib" "src/glib/META"]
+]
+remove: [
+    ["ocamlfind" "remove" "lwt_glib"]
+]
+depends: [
+  "lwt" {>= "2.7.0"}
+  "lablgtk"
+]

lwt_react.opam

@@ -0,0 +1,22 @@
+opam-version: "1.2"
+name: "lwt_react"
+version: "dev"
+maintainer: "Anton Bachin <[email protected]>"
+authors: [
+  "Jérémie Dimino"
+]
+homepage: "https://github.com/ocsigen/lwt"
+doc: "https://ocsigen.org/lwt/manual/"
+dev-repo: "https://github.com/ocsigen/lwt.git"
+bug-reports: "https://github.com/ocsigen/lwt/issues"
+license: "LGPL with OpenSSL linking exception"
+install: [
+    ["ocamlfind" "install" "lwt_react" "src/react/META"]
+]
+remove: [
+    ["ocamlfind" "remove" "lwt_react"]
+]
+depends: [
+  "lwt" {>= "2.7.0"}
+  "react" {>= "1.0.0"}
+]

lwt_ssl.opam

@@ -0,0 +1,23 @@
+opam-version: "1.2"
+name: "lwt_ssl"
+version: "dev"
+maintainer: "Anton Bachin <[email protected]>"
+authors: [
+  "Jérôme Vouillon"
+  "Jérémie Dimino"
+]
+homepage: "https://github.com/ocsigen/lwt"
+doc: "https://ocsigen.org/lwt/manual/"
+dev-repo: "https://github.com/ocsigen/lwt.git"
+bug-reports: "https://github.com/ocsigen/lwt/issues"
+license: "LGPL with OpenSSL linking exception"
+install: [
+    ["ocamlfind" "install" "lwt_ssl" "src/ssl/META"]
+]
+remove: [
+    ["ocamlfind" "remove" "lwt_ssl"]
+]
+depends: [
+  "lwt" {>= "2.7.0"}
+  "ssl" {>= "0.5.0"}
+]

src/glib/META

@@ -0,0 +1,3 @@
+version = "2.6.0"
+description = "Glib integration for Lwt"
+requires = "lwt.glib"

src/glib/lwt_glib.mli

@@ -59,7 +59,9 @@
         waiter
       )
     ]}
- *)
+
+    This module is provided by OPAM package [lwt_glib]. Link with ocamlfind
+    package [lwt_glib]. *)
 
 val install : ?mode : [ `glib_into_lwt | `lwt_into_glib ] -> unit -> unit
   (** Install the Glib<->Lwt integration.

src/react/META

@@ -0,0 +1,3 @@
+version = "2.6.0"
+description = "Reactive programming helpers for Lwt"
+requires = "lwt.react"

src/react/lwt_react.mli

@@ -9,9 +9,12 @@
 
 (** React utilities *)
 
-(** This module is a replacement for the React module. You can open it
-    instead of the React module in order to get all react's functions
-    plus Lwt ones. *)
+(** This module is an overlay for the [React] module. You can open it
+    instead of the [React] module in order to get all of [React]'s functions
+    plus Lwt ones.
+
+    This module is provided by OPAM package [lwt_react]. Link with ocamlfind
+    package [lwt_react]. *)
 
 type 'a event = 'a React.event
     (** Type of events. *)

src/ssl/META

@@ -0,0 +1,3 @@
+version = "2.6.0"
+description = "SSL support for Lwt"
+requires = "lwt.ssl"

src/ssl/lwt_ssl.mli

@@ -21,7 +21,10 @@
  * 02111-1307, USA.
  *)
 
-(** OCaml-SSL integration *)
+(** OCaml-SSL integration
+
+    This module is provided by OPAM package [lwt_ssl]. Link with ocamlfind
+    package [lwt_ssl]. *)
 
 type socket
   (** Wrapper for SSL sockets.

utils/appveyor-build.sh

@@ -1,4 +1,11 @@
 set -e
 set -x
 
-opam install -y --build-test --keep-build-dir --verbose lwt
+if [ "$SYSTEM" = cygwin ]
+then
+    PACKAGES="lwt lwt_react lwt_ssl"
+else
+    PACKAGES="lwt lwt_react"
+fi
+
+opam install -y --build-test --keep-build-dir --verbose $PACKAGES

utils/appveyor-install.sh

@@ -14,7 +14,12 @@ then
     opam init -y --auto-setup
     eval `opam config env`
 
-    opam pin add -y --no-action .
+    opam pin add -y --no-action lwt .
+    opam pin add -y --no-action lwt_react .
+    opam pin add -y --no-action lwt_ssl .
+    # lwt_glib is not tested at the moment; this is for future-proofing.
+    opam pin add -y --no-action lwt_glib .
+
     opam install -y --deps-only lwt
     # Install OUnit here; otherwie --build-test on installation of Lwt seems to
     # trigger recompilation of ocamlmod.
@@ -23,8 +28,6 @@ then
 
     if [ "$SYSTEM" = cygwin ]
     then
-        opam install -y ssl
-
         if [ "$LIBEV" = yes ]
         then
             opam install -y conf-libev

utils/dist.sh

@@ -28,11 +28,13 @@ oasis setup
 sed 's/^SETUP := setup-dev.exe.*/SETUP := setup.exe/' Makefile > Makefile.new
 mv Makefile.new Makefile
 
-# Adjust opam file
-sed "s/^version: \"dev\"/version: \"$VERSION\"/" opam > opam.1
-grep -vi oasis opam.1 > opam.2
-mv opam.2 opam
-rm opam.1
+# Adjust opam files
+for FILE in `ls *.opam`
+do
+    sed "s/^version: \"dev\"/version: \"$VERSION\"/" $FILE > $FILE.1
+    grep -vi oasis $FILE.1 > $FILE
+    rm $FILE.1
+done
 
 # Remove dev-files
 rm -f .jenkins.sh appveyor.yml .travis.yml *.exe configure _oasis

utils/travis.sh

@@ -123,12 +123,18 @@ fi
 
 # Pin Lwt, install its optional dependencies, then install Lwt and run the
 # tests.
-opam pin add -y --no-action .
-opam install -y `opam list --short --depopts --required-by lwt | grep -v '^conf-'`
+opam pin add -y --no-action lwt .
+opam pin add -y --no-action lwt_react .
+opam pin add -y --no-action lwt_ssl .
+opam pin add -y --no-action lwt_glib .
+
+opam install -y ocamlbuild ocamlfind oasis camlp4 ppx_tools result
 # Install OUnit here; otherwie --build-test on installation of Lwt seems to
 # trigger recompilation of ocamlmod.
 opam install -y ounit
-opam install -y --build-test --keep-build-dir --verbose lwt
+
+opam install -y --build-test --keep-build-dir --verbose \
+    lwt lwt_react lwt_ssl lwt_glib