Permalink
Browse files

Release 1.2.1

  • Loading branch information...
David Scott
David Scott committed Mar 15, 2013
1 parent f098042 commit c1cde1ead123e32fde0ac8841082f546dff32955
Showing with 134 additions and 420 deletions.
  1. +3 −0 CHANGES
  2. +1 −1 _oasis
  3. +5 −5 core/META
  4. +26 −56 myocamlbuild.ml
  5. +99 −358 setup.ml
View
@@ -1,3 +1,6 @@
+1.2.1 (15-Mar-2013):
+* Drop packets which are too large
+
1.2.0 (08-Feb-2013):
* Use the latest cstruct >=0.6.0 API.
View
2 _oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.3
Name: xenstore
-Version: 1.2.0
+Version: 1.2.1
Synopsis: Xenstore protocol library
Authors: see CREDITS.md
License: LGPL-2.1 with OCaml linking exception
View
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: 1c5c75e2c2dc58d4bf7c6f03e8bfb842)
-version = "1.2.0"
+# DO NOT EDIT (digest: 46e03992921ed3d7fea8513321d66342)
+version = "1.2.1"
description = "Xenstore protocol library"
requires = "cstruct cstruct.syntax"
archive(byte) = "xenstore.cma"
@@ -9,7 +9,7 @@ archive(native) = "xenstore.cmxa"
archive(native, plugin) = "xenstore.cmxs"
exists_if = "xenstore.cma"
package "unix" (
- version = "1.2.0"
+ version = "1.2.1"
description = "Xenstore protocol library"
requires = "unix threads xenstore"
archive(byte) = "xenstore_client_unix.cma"
@@ -20,7 +20,7 @@ package "unix" (
)
package "server" (
- version = "1.2.0"
+ version = "1.2.1"
description = "Xenstore protocol library"
requires = "lwt xenstore"
archive(byte) = "xenstore_server.cma"
@@ -31,7 +31,7 @@ package "server" (
)
package "client" (
- version = "1.2.0"
+ version = "1.2.1"
description = "Xenstore protocol library"
requires = "lwt xenstore"
archive(byte) = "xenstore_client_lwt.cma"
View
@@ -1,7 +1,7 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: a281c2093b27ca88083e1b27b5e533f1) *)
+(* DO NOT EDIT (digest: 4efa5ba626141a4c7a5df283dd80fba4) *)
module OASISGettext = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISGettext.ml" *)
+(* # 21 "/local/scratch/djs/.opam/system/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/system/build/oasis-mirage.0.3.0a/src/oasis/OASISExpr.ml" *)
+(* # 21 "/local/scratch/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISExpr.ml" *)
@@ -116,7 +116,7 @@ end
# 117 "myocamlbuild.ml"
module BaseEnvLight = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseEnvLight.ml" *)
+(* # 21 "/local/scratch/djs/.opam/system/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/system/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
+(* # 21 "/local/scratch/djs/.opam/system/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/system/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
+(* # 21 "/local/scratch/djs/.opam/system/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/system/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
+(* # 56 "/local/scratch/djs/.opam/system/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 =
{
@@ -529,6 +499,6 @@ let package_default =
let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;
-# 533 "myocamlbuild.ml"
+# 503 "myocamlbuild.ml"
(* OASIS_STOP *)
Ocamlbuild_plugin.dispatch dispatch_default;;
Oops, something went wrong.

0 comments on commit c1cde1e

Please sign in to comment.