Merge pull request xapi-project#65 from mseri/next

[opam/next] Update for lwt 3 and core/async >= v0.9.0
AsherBond · Jan 26, 2018 · f49bc99 · f49bc99
2 parents 376c040 + 8151ddd
commit f49bc99
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 27 deletions.
diff --git a/Makefile b/Makefile
@@ -1,25 +1,28 @@
+OPAM_PREFIX?=$(DESTDIR)$(shell opam config var prefix)
+OPAM_LIBDIR?=$(DESTDIR)$(shell opam config var lib)
+
 URL ?= https://github.com/xapi-project/xen-api
 BRANCH ?= master
 
-.PHONY: build release async-examples lwt-examples install uninstall clean test doc reindent regenerate
-
-build:
-	jbuilder build @install --dev
+.PHONY: release build async-examples lwt-examples install uninstall clean test doc reindent regenerate
 
 release:
 	jbuilder build @install
 
+build:
+	jbuilder build @install --dev
+
 async-examples:
 	jbuilder build @async_examples/examples
 
 lwt-examples:
 	jbuilder build @lwt_examples/examples
 
 install:
-	jbuilder install
+	jbuilder install --prefix=$(OPAM_PREFIX) --libdir=$(OPAM_LIBDIR)
 
 uninstall:
-	jbuilder uninstall
+	jbuilder uninstall --prefix=$(OPAM_PREFIX) --libdir=$(OPAM_LIBDIR)
 
 clean:
 	jbuilder clean

diff --git a/async/xen_api_async_unix.ml b/async/xen_api_async_unix.ml
@@ -14,8 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  *)
-open Core.Std
-open Async.Std
+open Core
+open Async
 open Xen_api
 
 module IO = struct
@@ -58,7 +58,7 @@ module IO = struct
     return () *)
 
   let flush (_, oc) =
-    Async.Std.Writer.flushed oc
+    Async.Writer.flushed oc
 
   let close ((close1, _), (close2, _)) =
     close1 () >>= fun () -> close2 ()
@@ -69,7 +69,8 @@ module IO = struct
       let port = match Uri.port uri with | None -> 80 | Some port -> port in
       begin match Uri.host uri with
         | Some host ->
-          Tcp.connect (Tcp.to_host_and_port host port)
+          let endp = Host_and_port.create ~host ~port in
+          Tcp.connect (Tcp.Where_to_connect.of_host_and_port endp)
           >>| fun (_, ic, oc) ->
           Ok (((fun () -> Reader.close ic), ic),
               ((fun () -> Writer.close oc), oc))
@@ -121,5 +122,5 @@ let make_json ?(timeout=30.) uri call =
   do_it uri req >>| Jsonrpc.response_of_string
 
 
-module Client = Client.ClientF(Deferred)
+module Client = Client.ClientF(struct include Deferred let bind a f = bind a ~f end)
 include Client
diff --git a/async/xen_api_async_unix.mli b/async/xen_api_async_unix.mli
@@ -12,12 +12,12 @@
  * GNU Lesser General Public License for more details.
  *)
 
-val make: ?timeout:float -> string -> Rpc.call -> Rpc.response Async.Std.Deferred.t
+val make: ?timeout:float -> string -> Rpc.call -> Rpc.response Async.Deferred.t
 (** [make ?timeout uri] returns an 'rpc' function which can be
     passed to Client.* functions *)
 
-val make_json: ?timeout:float -> string -> Rpc.call -> Rpc.response Async.Std.Deferred.t
+val make_json: ?timeout:float -> string -> Rpc.call -> Rpc.response Async.Deferred.t
 (** [make_json ?timeout uri] returns an 'rpc' function which can be
     passed to Client.* functions *)
 
-include (module type of (Client.ClientF(Async.Std.Deferred)))
+include (module type of (Client.ClientF(struct include Async.Deferred let bind a f = bind a ~f end)))
diff --git a/async_examples/event_test.ml b/async_examples/event_test.ml
@@ -12,8 +12,8 @@
  * GNU Lesser General Public License for more details.
  *)
 
-open Core.Std
-open Async.Std
+open Core
+open Async
 
 open Xen_api_async_unix
 

diff --git a/async_examples/list_vms.ml b/async_examples/list_vms.ml
@@ -12,8 +12,8 @@
  * GNU Lesser General Public License for more details.
  *)
 
-open Core.Std
-open Async.Std
+open Core
+open Async
 
 open Xen_api_async_unix
 

diff --git a/lwt/jbuild b/lwt/jbuild
@@ -5,7 +5,7 @@
    (cohttp
     cstruct
     lwt
-    lwt.ssl
+    lwt_ssl
     lwt.unix
     re.str
     rpclib

diff --git a/lwt_examples/jbuild b/lwt_examples/jbuild
@@ -3,7 +3,6 @@
   (modules (list_vms))
   (libraries
    (lwt
-    lwt.ssl
     lwt.unix
     xen-api-client
     xen-api-client-lwt))))
@@ -13,7 +12,6 @@
   (modules (upload_disk))
   (libraries
    (lwt
-    lwt.ssl
     lwt.unix
     xen-api-client
     xen-api-client-lwt))))
@@ -24,7 +22,6 @@
   (libraries
    (cohttp.lwt
     lwt
-    lwt.ssl
     lwt.unix
     xen-api-client
     xen-api-client-lwt))))

diff --git a/xen-api-client-async.opam b/xen-api-client-async.opam
@@ -17,8 +17,8 @@ build: [[ "jbuilder" "build" "-p" name ]]
 depends: [
   "jbuilder" {build & >= "1.0+beta11"}
   "astring"
-  "async" {>= "111.13.00" & < "v0.9.0"}
-  "cohttp" {>= "0.12.0" & < "0.22.0"}
+  "async" {>= "v0.9.0"}
+  "cohttp" {>= "0.22.0"}
   "rpc" {>= "1.9.52"}
   "uri"
   "xen-api-client"

diff --git a/xen-api-client-lwt.opam b/xen-api-client-lwt.opam
@@ -17,9 +17,10 @@ build: [[ "jbuilder" "build" "-p" name ]]
 depends: [
   "jbuilder" {build & >= "1.0+beta11"}
   "astring"
-  "cohttp" {>= "0.12.0" & < "0.22.0"}
+  "cohttp" {>= "0.22.0"}
   "cstruct" {>= "1.0.1"}
-  "lwt" {>= "2.4.3" & < "3.0.0"}
+  "lwt" {>= "3.0.0"}
+  "lwt_ssl"
   "re"
   "rpc" {>= "1.9.51"}
   "ssl"

diff --git a/xen-api-client.opam b/xen-api-client.opam
@@ -18,7 +18,7 @@ build-test: [[ "jbuilder" "runtest" "-p" name "-j" jobs ]]
 depends: [
   "jbuilder" {build & >= "1.0+beta11"}
   "astring"
-  "cohttp" {>= "0.12.0" & < "0.22.0"}
+  "cohttp" {>= "0.22.0"}
   "ounit" {test}
   "re"
   "rpc" {>= "1.9.51"}
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ @@
        (cohttp
         cstruct
         lwt
-        lwt.ssl
+        lwt_ssl
         lwt.unix
         re.str
         rpclib
@@ Expand Down @@