Skip to content

Commit

Permalink
Merge pull request #123 from samoht/master
Browse files Browse the repository at this point in the history
Fix missing build dep
  • Loading branch information
samoht committed Apr 22, 2014
2 parents 62638c6 + bea249c commit adfa748
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 12 deletions.
3 changes: 3 additions & 0 deletions CHANGES
@@ -1,3 +1,6 @@
0.11.2 (2014-04-21)
* Fix build by add a missing build-deps in _oasis

0.11.1 (2014-04-17):
* Remove an errant async_ssl reference left in the _oasis file that is
now handled by the Conduit library (#116).
Expand Down
4 changes: 2 additions & 2 deletions _oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.3
Name: cohttp
Version: 0.11.1
Version: 0.11.2
Synopsis: HTTP library for Lwt, Async and Mirage
Authors: Anil Madhavapeddy, Stefano Zacchiroli, David Sheets, Thomas Gazagnaire, David Scott, Rudi Grinberg
License: ISC
Expand Down Expand Up @@ -213,7 +213,7 @@ Executable "cohttp-server-async"
Executable "cohttp-server-lwt"
Path: bin
MainIs: cohttp_server_lwt.ml
Build$: flag(lwt)
Build$: flag(lwt) && flag(lwt_unix)
Custom: true
CompiledObject: best
Install: true
Expand Down
10 changes: 5 additions & 5 deletions cohttp/META
@@ -1,6 +1,6 @@
# OASIS_START
# DO NOT EDIT (digest: 3ebd0d55b017be9529a25ab3145c25b1)
version = "0.11.1"
# DO NOT EDIT (digest: 5befc71dded4d98b9a913959c39cfb57)
version = "0.11.2"
description = "HTTP library for Lwt, Async and Mirage"
requires =
"re.emacs stringext uri uri.services fieldslib fieldslib.syntax sexplib sexplib.syntax"
Expand All @@ -10,7 +10,7 @@ archive(native) = "cohttp.cmxa"
archive(native, plugin) = "cohttp.cmxs"
exists_if = "cohttp.cma"
package "lwt-core" (
version = "0.11.1"
version = "0.11.2"
description = "HTTP library for Lwt, Async and Mirage"
requires = "lwt uri cohttp lwt.syntax conduit.lwt"
archive(byte) = "cohttp_lwt.cma"
Expand All @@ -21,7 +21,7 @@ package "lwt-core" (
)

package "lwt" (
version = "0.11.1"
version = "0.11.2"
description = "HTTP library for Lwt, Async and Mirage"
requires = "cohttp.lwt-core unix lwt.unix lwt.ssl"
archive(byte) = "cohttp_lwt_unix.cma"
Expand All @@ -32,7 +32,7 @@ package "lwt" (
)

package "async" (
version = "0.11.1"
version = "0.11.2"
description = "HTTP library for Lwt, Async and Mirage"
requires = "uri cohttp threads async conduit.async"
archive(byte) = "cohttp_async.cma"
Expand Down
13 changes: 8 additions & 5 deletions setup.ml
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.4.4 *)

(* OASIS_START *)
(* DO NOT EDIT (digest: 86dd6ae2f61b966cfbde6662ca50e3b3) *)
(* DO NOT EDIT (digest: 3c4b7191d35404fdccc699582980b30b) *)
(*
Regenerated by OASIS v0.4.4
Visit http://oasis.forge.ocamlcore.org for more information and
Expand Down Expand Up @@ -6934,7 +6934,7 @@ let setup_t =
alpha_features = [];
beta_features = [];
name = "cohttp";
version = "0.11.1";
version = "0.11.2";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
Expand Down Expand Up @@ -7846,7 +7846,10 @@ let setup_t =
bs_build =
[
(OASISExpr.EBool true, false);
(OASISExpr.EFlag "lwt", true)
(OASISExpr.EAnd
(OASISExpr.EFlag "lwt",
OASISExpr.EFlag "lwt_unix"),
true)
];
bs_install = [(OASISExpr.EBool true, true)];
bs_path = "bin";
Expand Down Expand Up @@ -8048,14 +8051,14 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.4";
oasis_digest = Some "\003G@-Åe\\@ qÛ\149q£nÇ";
oasis_digest = Some "\r\150¤\020ÜÙÂC<£\147\\úÔ\023\017";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
};;

let setup () = BaseSetup.setup setup_t;;

# 8060 "setup.ml"
# 8063 "setup.ml"
(* OASIS_STOP *)
let () = setup ();;

0 comments on commit adfa748

Please sign in to comment.