Skip to content

Commit

Permalink
release: backport cohttp version constraint to 0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
seliopou committed Jun 27, 2016
1 parent c3315c7 commit 23c8a0b
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 12 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.1.1
Version: 0.1.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.9.11), re (>= 1.3.0), re.str
BuildDepends: cohttp (>= 0.12.0 && < 0.21.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: eb891f94fa3634084596ae90c49cd93b)
version = "0.1.0"
# DO NOT EDIT (digest: 60d9b644193ba57c6c5fa40c720c6cc6)
version = "0.1.2"
description = "A REST toolkit for OCaml"
requires = "cohttp re re.str"
archive(byte) = "webmachine.cma"
Expand Down
4 changes: 2 additions & 2 deletions opam
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "1.2"
name: "webmachine"
version: "dev"
version: "0.1.2"
maintainer: "Spiros Eliopoulos <[email protected]>"
author: "Inhabited Type LLC"
homepage: "https://github.com/inhabitedtype/ocaml-webmachine"
Expand All @@ -22,7 +22,7 @@ build-test: [
]
build-doc: [ "ocaml" "setup.ml" "-doc" ]
depends: [
"cohttp" {>= "0.9.11"}
"cohttp" {>= "0.12.0" & < "0.21.0"}
"ocamlfind" {build}
"ounit" {test & >= "1.0.2"}
"re" {>= "1.3.0"}
Expand Down
17 changes: 11 additions & 6 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: a18ed637b4725ec368cd4e6a4680b120) *)
(* DO NOT EDIT (digest: 2fc3fe39cc1ca7c21089f4b2d7445d14) *)
(*
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.1.0";
version = "0.1.2";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
Expand All @@ -6910,7 +6910,7 @@ let setup_t =
Some
[
OASISText.Para
"OCaml webmachine is a layer on top of cohttp that implements a state-machine-based HTTP request processor. It's particularly well-suited for writing RESTful APIs. As the name suggests, this is an OCaml port of the webmachine project."
"OCaml webmachine is a layer on top of cohttp that implements a state-machine-based HTTP request processor. It's particularly well-suited for writing RESTful APIs. As the name suggests, this is an OCaml port of the webmachine project."
];
categories = [];
conf_type = (`Configure, "internal", Some "0.4");
Expand Down Expand Up @@ -6972,7 +6972,12 @@ let setup_t =
bs_compiled_object = Best;
bs_build_depends =
[
FindlibPackage ("cohttp", None);
FindlibPackage
("cohttp",
Some
(OASISVersion.VAnd
(OASISVersion.VGreaterEqual "0.12.0",
OASISVersion.VLesser "0.21.0")));
FindlibPackage
("re",
Some (OASISVersion.VGreaterEqual "1.3.0"));
Expand Down Expand Up @@ -7241,14 +7246,14 @@ let setup_t =
oasis_fn = Some "_oasis";
oasis_version = "0.4.5";
oasis_digest =
Some "\012\213\024\146\141sw\171A\143\175\164\163\209\241\001";
Some "\212\rpm\148\174\230\144\031\198\185\233\136\127\138\154";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
};;

let setup () = BaseSetup.setup setup_t;;

# 7253 "setup.ml"
# 7258 "setup.ml"
(* OASIS_STOP *)
let () = setup ();;

0 comments on commit 23c8a0b

Please sign in to comment.