Skip to content

Commit

Permalink
Merge pull request #25 from djs55/update-changelog-for-release
Browse files Browse the repository at this point in the history
Update changelog and packaging for release 1.3.0
  • Loading branch information
djs55 committed Mar 14, 2016
2 parents bf1d58d + 84c7a13 commit 6448e16
Show file tree
Hide file tree
Showing 13 changed files with 148 additions and 24 deletions.
11 changes: 11 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
1.3.0 (14-Mar-2016):
* Add EEXIST exception to the interface
* Allow Ocaml xenstore clients to receive oversized replies from xenstored
* Return the task for a wait asynchronously
* Increase maximum incoming watch limit from 1024 to 65536
* Don't leak watch strings in clients
* Add opam file
* Ensure errors from wait functions aren't lost
* Fix a non-tail call in the dispatcher
* Switch to ppx from camlp4

1.2.5 (04-Oct-2013):
* Add Travis continuous integration scripts
* fix a spurious EQUOTA failure when processing transactions
Expand Down
24 changes: 20 additions & 4 deletions _oasis
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
OASISFormat: 0.3
Name: xenstore
Version: 1.2.5
Version: 1.3.0
Synopsis: Xenstore protocol library
Authors: see CREDITS.md
License: LGPL-2.1 with OCaml linking exception
Expand Down Expand Up @@ -67,10 +67,26 @@ Test server_test
Command: $server_test
WorkingDirectory: server_test

Document api
Document core
Title: Documentation and API reference
Type: ocamlbuild (0.3)
BuildTools+: ocamldoc
XOcamlbuildPath: doc
XOcamlbuildModules: Xs_protocol, Xs_handle, Xs_client_lwt, Xs_client_unix
XOcamlbuildPath: core
XOcamlbuildModules: Xs_protocol, Xs_handle
Install: false

Document client_lwt
Title: Documentation and API reference
Type: ocamlbuild (0.3)
BuildTools+: ocamldoc
XOcamlbuildPath: client_lwt
XOcamlbuildModules: Xs_client_lwt
Install: false

Document client_unix
Title: Documentation and API reference
Type: ocamlbuild (0.3)
BuildTools+: ocamldoc
XOcamlbuildPath: client_unix
XOcamlbuildModules: Xs_client_unix
Install: false
5 changes: 0 additions & 5 deletions _tags
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,3 @@ true: annot, bin_annot
<server_test/*.ml{,i,y}>: use_xenstore_server
<server_test/server_test.{native,byte}>: custom
# OASIS_STOP
true: annot
<core>: include
<client_lwt>: include
<client_unix>: include
<server>: include
4 changes: 4 additions & 0 deletions client_lwt/client_lwt.odocl
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# OASIS_START
# DO NOT EDIT (digest: c330a9a726f26eed8831f1bc154072e5)
Xs_client_lwt
# OASIS_STOP
4 changes: 4 additions & 0 deletions client_lwt/xenstore_client_lwt.mldylib
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# OASIS_START
# DO NOT EDIT (digest: c330a9a726f26eed8831f1bc154072e5)
Xs_client_lwt
# OASIS_STOP
4 changes: 4 additions & 0 deletions client_unix/client_unix.odocl
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# OASIS_START
# DO NOT EDIT (digest: 3b3d3372c0e77b8e05c56f53b81a6e3e)
Xs_client_unix
# OASIS_STOP
4 changes: 4 additions & 0 deletions client_unix/xenstore_client_unix.mldylib
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# OASIS_START
# DO NOT EDIT (digest: 3b3d3372c0e77b8e05c56f53b81a6e3e)
Xs_client_unix
# OASIS_STOP
10 changes: 5 additions & 5 deletions core/META
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# OASIS_START
# DO NOT EDIT (digest: 41fdc7cc73aa8c461eb2da1f0febe4c4)
version = "1.2.5"
# DO NOT EDIT (digest: 5286fd4702a468962ba263604fb01e68)
version = "1.3.0"
description = "Xenstore protocol library"
requires = "cstruct cstruct.ppx"
archive(byte) = "xenstore.cma"
Expand All @@ -9,7 +9,7 @@ archive(native) = "xenstore.cmxa"
archive(native, plugin) = "xenstore.cmxs"
exists_if = "xenstore.cma"
package "unix" (
version = "1.2.5"
version = "1.3.0"
description = "Xenstore protocol library"
requires = "unix threads xenstore"
archive(byte) = "xenstore_client_unix.cma"
Expand All @@ -20,7 +20,7 @@ package "unix" (
)

package "server" (
version = "1.2.5"
version = "1.3.0"
description = "Xenstore protocol library"
requires = "lwt xenstore"
archive(byte) = "xenstore_server.cma"
Expand All @@ -31,7 +31,7 @@ package "server" (
)

package "client" (
version = "1.2.5"
version = "1.3.0"
description = "Xenstore protocol library"
requires = "lwt xenstore"
archive(byte) = "xenstore_client_lwt.cma"
Expand Down
5 changes: 5 additions & 0 deletions core/core.odocl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# OASIS_START
# DO NOT EDIT (digest: d93f3abe5887f90e78faf0190e6e5028)
Xs_protocol
Xs_handle
# OASIS_STOP
5 changes: 5 additions & 0 deletions core/xenstore.mldylib
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# OASIS_START
# DO NOT EDIT (digest: d93f3abe5887f90e78faf0190e6e5028)
Xs_protocol
Xs_handle
# OASIS_STOP
4 changes: 4 additions & 0 deletions server/xenstore_server.mldylib
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# OASIS_START
# DO NOT EDIT (digest: 92d03ee44050cfe9557b4a130a97eae8)
Xenstore_server
# OASIS_STOP
4 changes: 4 additions & 0 deletions server/xenstore_server.mllib
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# OASIS_START
# DO NOT EDIT (digest: 92d03ee44050cfe9557b4a130a97eae8)
Xenstore_server
# OASIS_STOP
88 changes: 78 additions & 10 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.2.0 *)
(* setup.ml generated for the first time by OASIS v0.4.5 *)

(* OASIS_START *)
(* DO NOT EDIT (digest: d4455b6a9cdea42b34c6928f66bc7678) *)
(* DO NOT EDIT (digest: 5962889c70bd379dc329cdffb74545c0) *)
(*
Regenerated by OASIS v0.4.5
Visit http://oasis.forge.ocamlcore.org for more information and
Expand Down Expand Up @@ -6824,9 +6824,15 @@ let setup_t =
];
doc =
[
("api",
("core",
OCamlbuildDocPlugin.doc_build
{OCamlbuildDocPlugin.extra_args = []; run_path = "doc"})
{OCamlbuildDocPlugin.extra_args = []; run_path = "core"});
("client_lwt",
OCamlbuildDocPlugin.doc_build
{OCamlbuildDocPlugin.extra_args = []; run_path = "client_lwt"});
("client_unix",
OCamlbuildDocPlugin.doc_build
{OCamlbuildDocPlugin.extra_args = []; run_path = "client_unix"})
];
install = InternalInstallPlugin.install;
uninstall = InternalInstallPlugin.uninstall;
Expand All @@ -6852,9 +6858,15 @@ let setup_t =
];
clean_doc =
[
("api",
("core",
OCamlbuildDocPlugin.doc_clean
{OCamlbuildDocPlugin.extra_args = []; run_path = "core"});
("client_lwt",
OCamlbuildDocPlugin.doc_clean
{OCamlbuildDocPlugin.extra_args = []; run_path = "client_lwt"});
("client_unix",
OCamlbuildDocPlugin.doc_clean
{OCamlbuildDocPlugin.extra_args = []; run_path = "doc"})
{OCamlbuildDocPlugin.extra_args = []; run_path = "client_unix"})
];
distclean = [];
distclean_test =
Expand Down Expand Up @@ -6885,7 +6897,7 @@ let setup_t =
alpha_features = [];
beta_features = [];
name = "xenstore";
version = "1.2.5";
version = "1.3.0";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
Expand Down Expand Up @@ -7217,7 +7229,63 @@ let setup_t =
});
Doc
({
cs_name = "api";
cs_name = "core";
cs_data = PropList.Data.create ();
cs_plugin_data = []
},
{
doc_type = (`Doc, "ocamlbuild", Some "0.3");
doc_custom =
{
pre_command = [(OASISExpr.EBool true, None)];
post_command = [(OASISExpr.EBool true, None)]
};
doc_build =
[
(OASISExpr.ENot (OASISExpr.EFlag "docs"), false);
(OASISExpr.EFlag "docs", true)
];
doc_install = [(OASISExpr.EBool true, false)];
doc_install_dir = "$docdir";
doc_title = "Documentation and API reference";
doc_authors = [];
doc_abstract = None;
doc_format = OtherDoc;
doc_data_files = [];
doc_build_tools =
[ExternalTool "ocamlbuild"; ExternalTool "ocamldoc"]
});
Doc
({
cs_name = "client_lwt";
cs_data = PropList.Data.create ();
cs_plugin_data = []
},
{
doc_type = (`Doc, "ocamlbuild", Some "0.3");
doc_custom =
{
pre_command = [(OASISExpr.EBool true, None)];
post_command = [(OASISExpr.EBool true, None)]
};
doc_build =
[
(OASISExpr.ENot (OASISExpr.EFlag "docs"), false);
(OASISExpr.EFlag "docs", true)
];
doc_install = [(OASISExpr.EBool true, false)];
doc_install_dir = "$docdir";
doc_title = "Documentation and API reference";
doc_authors = [];
doc_abstract = None;
doc_format = OtherDoc;
doc_data_files = [];
doc_build_tools =
[ExternalTool "ocamlbuild"; ExternalTool "ocamldoc"]
});
Doc
({
cs_name = "client_unix";
cs_data = PropList.Data.create ();
cs_plugin_data = []
},
Expand Down Expand Up @@ -7251,14 +7319,14 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.5";
oasis_digest = Some "LÄ.\153\030Ú¼Òm[\1351\157jáV";
oasis_digest = Some "\1541\003\004ÖÏ3\031\003ã0_%¹";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
};;

let setup () = BaseSetup.setup setup_t;;

# 7263 "setup.ml"
# 7331 "setup.ml"
(* OASIS_STOP *)
let () = setup ();;

0 comments on commit 6448e16

Please sign in to comment.