Permalink
Browse files

update oasis

  • Loading branch information...
1 parent f600c1f commit f1d57a1dc4ba3909d2892ad8809eeb0bfb00ea5d @avsm committed Jan 28, 2013
Showing with 137 additions and 420 deletions.
  1. +2 −4 Makefile
  2. +1 −1 _oasis
  3. +5 −1 _tags
  4. +26 −56 myocamlbuild.ml
  5. +103 −358 setup.ml
View
@@ -4,9 +4,7 @@ all: build test doc
PREFIX ?= /usr/local
NAME=cohttp
-LWT ?= $(shell if ocamlfind query lwt.ssl >/dev/null 2>&1; then echo --enable-lwt; fi)
-ASYNC ?= $(shell if ocamlfind query async_core >/dev/null 2>&1; then echo --enable-async; fi)
-MIRAGE ?= $(shell if ocamlfind query mirage-net >/dev/null 2>&1; then echo --enable-mirage; fi)
+ASYNC=--enable-async
ifneq ($(MIRAGE_OS),xen)
TESTS ?= --enable-tests
endif
@@ -21,7 +19,7 @@ setup.data: setup.bin
./setup.bin -configure $(LWT) $(ASYNC) $(MIRAGE) $(TESTS) $(NETTESTS) --prefix $(PREFIX)
build: setup.data setup.bin
- ./setup.bin -build
+ ./setup.bin -build -classic-display
doc: setup.data setup.bin
./setup.bin -doc
View
@@ -11,7 +11,7 @@ Library cohttp
Path: cohttp
Findlibname: cohttp
Pack: true
- Modules: Code, Header, Cookie, Request, Response, Transfer, Accept, Accept_parser, Accept_lexer, Base64, Auth, Make
+ Modules: Code, Header, Cookie, Request, Response, Transfer, Accept, Accept_parser, Accept_lexer, Base64, Auth, Make, Header_io, Transfer_io, Client, Body
BuildDepends: re, uri (>= 1.3.2), uri.services
Flag lwt
View
@@ -1,5 +1,5 @@
# OASIS_START
-# DO NOT EDIT (digest: 6085779dcfe67e803faecfeb7d41a91a)
+# DO NOT EDIT (digest: 6f4f30fd7f3f6b22c692b18380708dfe)
# Ignore VCS directories, you can use the same kind of rule outside
# OASIS_START/STOP if you want to exclude directories that contains
# useless stuff for the build process
@@ -27,6 +27,10 @@
"cohttp/base64.cmx": for-pack(Cohttp)
"cohttp/auth.cmx": for-pack(Cohttp)
"cohttp/make.cmx": for-pack(Cohttp)
+"cohttp/header_io.cmx": for-pack(Cohttp)
+"cohttp/transfer_io.cmx": for-pack(Cohttp)
+"cohttp/client.cmx": for-pack(Cohttp)
+"cohttp/body.cmx": for-pack(Cohttp)
<cohttp/*.ml{,i}>: pkg_uri
<cohttp/*.ml{,i}>: pkg_re
<cohttp/*.ml{,i}>: pkg_uri.services
View
@@ -1,7 +1,7 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: d18ae3e4634218b063930bac4c8d8990) *)
+(* DO NOT EDIT (digest: 630f7e586675e711f016d5732dd1d21c) *)
module OASISGettext = struct
-(* # 21 "/home/avsm/.opam/4.01.0dev+mirage-unix/build/oasis-mirage.0.3.0a/src/oasis/OASISGettext.ml" *)
+(* # 21 "/Users/avsm/.opam/4.01.0dev+mirage-unix/build/oasis.0.3.0/src/oasis/OASISGettext.ml" *)
let ns_ str =
str
@@ -24,7 +24,7 @@ module OASISGettext = struct
end
module OASISExpr = struct
-(* # 21 "/home/avsm/.opam/4.01.0dev+mirage-unix/build/oasis-mirage.0.3.0a/src/oasis/OASISExpr.ml" *)
+(* # 21 "/Users/avsm/.opam/4.01.0dev+mirage-unix/build/oasis.0.3.0/src/oasis/OASISExpr.ml" *)
@@ -116,7 +116,7 @@ end
# 117 "myocamlbuild.ml"
module BaseEnvLight = struct
-(* # 21 "/home/avsm/.opam/4.01.0dev+mirage-unix/build/oasis-mirage.0.3.0a/src/base/BaseEnvLight.ml" *)
+(* # 21 "/Users/avsm/.opam/4.01.0dev+mirage-unix/build/oasis.0.3.0/src/base/BaseEnvLight.ml" *)
module MapString = Map.Make(String)
@@ -214,7 +214,7 @@ end
# 215 "myocamlbuild.ml"
module MyOCamlbuildFindlib = struct
-(* # 21 "/home/avsm/.opam/4.01.0dev+mirage-unix/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
+(* # 21 "/Users/avsm/.opam/4.01.0dev+mirage-unix/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
(** OCamlbuild extension, copied from
* http://brion.inria.fr/gallium/index.php/Using_ocamlfind_with_ocamlbuild
@@ -234,21 +234,19 @@ module MyOCamlbuildFindlib = struct
Ocamlbuild_pack.Lexers.blank_sep_strings
let split s ch =
- let buf = Buffer.create 13 in
- let x = ref [] in
- let flush () =
- x := (Buffer.contents buf) :: !x;
- Buffer.clear buf
+ let x =
+ ref []
in
- String.iter
- (fun c ->
- if c = ch then
- flush ()
- else
- Buffer.add_char buf c)
- s;
- flush ();
- List.rev !x
+ let rec go s =
+ let pos =
+ String.index s ch
+ in
+ x := (String.before s pos)::!x;
+ go (String.after s (pos + 1))
+ in
+ try
+ go s
+ with Not_found -> !x
let split_nl s = split s '\n'
@@ -283,27 +281,17 @@ module MyOCamlbuildFindlib = struct
(* When one link an OCaml library/binary/package, one should use -linkpkg *)
flag ["ocaml"; "link"; "program"] & A"-linkpkg";
- flag ["ocaml"; "link"; "output_obj"] & A"-linkpkg";
(* For each ocamlfind package one inject the -package option when
* compiling, computing dependencies, generating documentation and
* linking. *)
List.iter
begin fun pkg ->
- let base_args = [A"-package"; A pkg] in
- let syn_args = [A"-syntax"; A "camlp4o"] in
- let args =
- (* heuristic to identify syntax extensions:
- whether they end in ".syntax"; some might not *)
- if Filename.check_suffix pkg "syntax"
- then syn_args @ base_args
- else base_args
- in
- flag ["ocaml"; "compile"; "pkg_"^pkg] & S args;
- flag ["ocaml"; "ocamldep"; "pkg_"^pkg] & S args;
- flag ["ocaml"; "doc"; "pkg_"^pkg] & S args;
- flag ["ocaml"; "link"; "pkg_"^pkg] & S base_args;
- flag ["ocaml"; "infer_interface"; "pkg_"^pkg] & S args;
+ flag ["ocaml"; "compile"; "pkg_"^pkg] & S[A"-package"; A pkg];
+ flag ["ocaml"; "ocamldep"; "pkg_"^pkg] & S[A"-package"; A pkg];
+ flag ["ocaml"; "doc"; "pkg_"^pkg] & S[A"-package"; A pkg];
+ flag ["ocaml"; "link"; "pkg_"^pkg] & S[A"-package"; A pkg];
+ flag ["ocaml"; "infer_interface"; "pkg_"^pkg] & S[A"-package"; A pkg];
end
(find_packages ());
@@ -335,7 +323,7 @@ module MyOCamlbuildFindlib = struct
end
module MyOCamlbuildBase = struct
-(* # 21 "/home/avsm/.opam/4.01.0dev+mirage-unix/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
+(* # 21 "/Users/avsm/.opam/4.01.0dev+mirage-unix/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
(** Base functions for writing myocamlbuild.ml
@author Sylvain Le Gall
@@ -351,7 +339,7 @@ module MyOCamlbuildBase = struct
type name = string
type tag = string
-(* # 56 "/home/avsm/.opam/4.01.0dev+mirage-unix/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
+(* # 56 "/Users/avsm/.opam/4.01.0dev+mirage-unix/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
type t =
{
@@ -464,24 +452,6 @@ module MyOCamlbuildBase = struct
)
t.lib_c;
- (* Add output_obj rules mapped to .nobj.o *)
- let native_output_obj x =
- OC.link_gen "cmx" "cmxa" !Options.ext_lib [!Options.ext_obj; "cmi"]
- OC.ocamlopt_link_prog
- (fun tags -> tags++"ocaml"++"link"++"native"++"output_obj") x
- in
- rule "ocaml: cmx* and o* -> .nobj.o" ~prod:"%.nobj.o" ~deps:["%.cmx"; "%.o"]
- (native_output_obj "%.cmx" "%.nobj.o");
-
- (* Add output_obj rules mapped to .bobj.o *)
- let bytecode_output_obj x =
- OC.link_gen "cmo" "cma" !Options.ext_lib [!Options.ext_obj; "cmi"]
- OC.ocamlc_link_prog
- (fun tags -> tags++"ocaml"++"link"++"byte"++"output_obj") x
- in
- rule "ocaml: cmo* -> .nobj.o" ~prod:"%.bobj.o" ~deps:["%.cmo"]
- (bytecode_output_obj "%.cmo" "%.bobj.o");
-
(* Add flags *)
List.iter
(fun (tags, cond_specs) ->
@@ -503,7 +473,7 @@ module MyOCamlbuildBase = struct
end
-# 506 "myocamlbuild.ml"
+# 476 "myocamlbuild.ml"
open Ocamlbuild_plugin;;
let package_default =
{
@@ -527,7 +497,7 @@ let package_default =
let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;
-# 531 "myocamlbuild.ml"
+# 501 "myocamlbuild.ml"
(* OASIS_STOP *)
open Ocamlbuild_plugin
Oops, something went wrong.

0 comments on commit f1d57a1

Please sign in to comment.