Merge pull request #112 from avsm/r2.3.0

release 2.3.0, and add ocaml 4.04 to the test matrix
mirage · Aug 17, 2016 · e3ac4fe · e3ac4fe
2 parents 36993e0 + 3c93069
commit e3ac4fe
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,3 +18,4 @@ env:
   - DISTRO="centos-6" OCAML_VERSION="4.02.3"
   - DISTRO="alpine-3.4" OCAML_VERSION="4.03.0"
   - DISTRO="fedora-24" OCAML_VERSION="4.03.0"
+  - DISTRO="opensuse-42.1" OCAML_VERSION="4.04.0"
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,9 @@
+2.3.0 (2016-08-16):
+* Add `Cstruct.of_bytes/to_bytes`. In common with the existing
+  implementation, this relies on the representation of bytes and string
+  being the same, which is true as of OCaml 4.04 and lower (#105 via @yallop).
+* Support OCaml 4.04 (#111 via @gasche).
+
 2.2.0 (2016-06-30):
 * Make `create` zero out the new buffer. The new `create_unsafe`
   function can be used if you want to trade safety for speed.

diff --git a/_oasis b/_oasis
@@ -1,6 +1,6 @@
 OASISFormat: 0.4
 Name:        cstruct
-Version:     2.2.0
+Version:     2.3.0
 Synopsis:    Manipulate external buffers as C-like structs
 Authors:     Anil Madhavapeddy, Richard Mortier, Thomas Gazagnaire,
              Pierre Chambart, David Kaloper, Jeremy Yallop, Hannes Mehnert

diff --git a/lib/META b/lib/META
@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: d568f8e4d2049c28f0943886f3991470)
-version = "2.2.0"
+# DO NOT EDIT (digest: b89387813cbaaaac77e59b6a9416113a)
+version = "2.3.0"
 description = "Manipulate external buffers as C-like structs"
 requires = "bytes bigarray ocplib-endian ocplib-endian.bigstring sexplib"
 archive(byte) = "cstruct.cma"
@@ -9,7 +9,7 @@ archive(native) = "cstruct.cmxa"
 archive(native, plugin) = "cstruct.cmxs"
 exists_if = "cstruct.cma"
 package "unix" (
- version = "2.2.0"
+ version = "2.3.0"
  description = "Manipulate external buffers as C-like structs"
  requires = "cstruct unix"
  archive(byte) = "unix_cstruct.cma"
@@ -20,7 +20,7 @@ package "unix" (
 )
 
 package "lwt" (
- version = "2.2.0"
+ version = "2.3.0"
  description = "Manipulate external buffers as C-like structs"
  requires = "cstruct lwt.unix"
  archive(byte) = "lwt_cstruct.cma"
@@ -31,7 +31,7 @@ package "lwt" (
 )
 
 package "async" (
- version = "2.2.0"
+ version = "2.3.0"
  description = "Manipulate external buffers as C-like structs"
  requires = "cstruct async threads"
  archive(byte) = "async_cstruct.cma"

diff --git a/select_ppx_version.sh b/select_ppx_version.sh
@@ -2,8 +2,8 @@
 
 case $1 in
   clean) rm -f ppx/ppx_cstruct.ml; exit 0 ;;
-  conf) (* continue *) ;;
-  *) echo "supported actions: conf, clean"; exit 1 ;;
+  conf) ;;
+  *) echo "Usage: $0 [conf|clean]"; exit 1 ;;
 esac
 
 V=`ocamlc -version`

diff --git a/setup.ml b/setup.ml
@@ -1,7 +1,7 @@
-(* setup.ml generated for the first time by OASIS v0.4.5 *)
+(* setup.ml generated for the first time by OASIS v0.4.6 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 2c117050cd24f1f539bcbb15e6c9b4ee) *)
+(* DO NOT EDIT (digest: f6315f8e853b1b704f4aecfe79f3bf95) *)
 (*
    Regenerated by OASIS v0.4.6
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6992,7 +6992,7 @@ let setup_t =
           alpha_features = [];
           beta_features = [];
           name = "cstruct";
-          version = "2.2.0";
+          version = "2.3.0";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
@@ -7692,14 +7692,15 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.6";
-     oasis_digest = Some "\200\140\248\216\191\208K9\011\215L\207\r(\166+";
+     oasis_digest =
+       Some "\190\023\1409\001|\230\224\175\179\189\027\217\229\148\017";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
   };;
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 7704 "setup.ml"
+# 7705 "setup.ml"
 (* OASIS_STOP *)
 let () = setup ();;