Skip to content

Commit

Permalink
release: backport cohttp version constraint to 0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
seliopou committed Jun 27, 2016
1 parent 56a6fef commit 4c32305
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 11 deletions.
4 changes: 2 additions & 2 deletions _oasis
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
OASISFormat: 0.4
Name: webmachine
Version: 0.3.1
Version: 0.3.2
Synopsis: A REST toolkit for OCaml
Description: OCaml webmachine is a layer on top of cohttp that implements a
state-machine-based HTTP request processor. It's particularly well-suited for
Expand All @@ -23,7 +23,7 @@ Library webmachine
Path: lib
InternalModules: Wm_util
Modules: Webmachine
BuildDepends: cohttp (>= 0.12.0), dispatch (>= 0.3.0), re (>= 1.3.0), re.str
BuildDepends: cohttp (>= 0.12.0 && < 0.21.0), dispatch (>= 0.3.0), re (>= 1.3.0), re.str

Document webmachine
Title: webmachine docs
Expand Down
4 changes: 2 additions & 2 deletions lib/META
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# OASIS_START
# DO NOT EDIT (digest: f84d298794c839217704aa7fae6c5950)
version = "0.3.1"
# DO NOT EDIT (digest: c4e0a609f3439c4859658a2d9b47d954)
version = "0.3.2"
description = "A REST toolkit for OCaml"
requires = "cohttp dispatch re re.str"
archive(byte) = "webmachine.cma"
Expand Down
4 changes: 2 additions & 2 deletions opam/opam
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "1.2"
name: "webmachine"
version: "0.3.1"
version: "0.3.2"
maintainer: "Spiros Eliopoulos <[email protected]>"
authors: [ "Spiros Eliopoulos <[email protected]>" ]
license: "BSD-3-clause"
Expand All @@ -22,7 +22,7 @@ build-test: [
]
build-doc: [ "ocaml" "setup.ml" "-doc" ]
depends: [
"cohttp" {>= "0.12.0"}
"cohttp" {>= "0.12.0" & < "0.21.0"}
"dispatch" {>= "0.3.0"}
"ocamlfind" {build}
"ounit" {test & >= "1.0.2"}
Expand Down
14 changes: 9 additions & 5 deletions setup.ml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.4.5 *)

(* OASIS_START *)
(* DO NOT EDIT (digest: 9df34bc7cffb681af6f107a41edb845f) *)
(* DO NOT EDIT (digest: ea1890c43fabbffc3b9a9a89907f17c5) *)
(*
Regenerated by OASIS v0.4.5
Visit http://oasis.forge.ocamlcore.org for more information and
Expand Down Expand Up @@ -6891,7 +6891,7 @@ let setup_t =
alpha_features = [];
beta_features = [];
name = "webmachine";
version = "0.3.1";
version = "0.3.2";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
Expand Down Expand Up @@ -6974,7 +6974,10 @@ let setup_t =
[
FindlibPackage
("cohttp",
Some (OASISVersion.VGreaterEqual "0.12.0"));
Some
(OASISVersion.VAnd
(OASISVersion.VGreaterEqual "0.12.0",
OASISVersion.VLesser "0.21.0")));
FindlibPackage
("dispatch",
Some (OASISVersion.VGreaterEqual "0.3.0"));
Expand Down Expand Up @@ -7278,14 +7281,15 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.5";
oasis_digest = Some "\011I\224 \2359|x[M\211a\207\022e\002";
oasis_digest =
Some "\251\188\133\133\002T\019\253\b\241\204\n\225P\255\023";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
};;

let setup () = BaseSetup.setup setup_t;;

# 7290 "setup.ml"
# 7294 "setup.ml"
(* OASIS_STOP *)
let () = setup ();;

0 comments on commit 4c32305

Please sign in to comment.