Merge pull request #186 from djs55/prepare.3.0.1

Prepare to release v3.0.1

Author: djs55

CHANGES.md

@@ -1,3 +1,8 @@
+## 3.0.1 (2017-05-29)
+* [xen]: Depend on the new shared-memory-ring-lwt package
+* Update appveyor configuration
+* Reformat CHANGES.md to the topkg/Mirage style
+
 ## 3.0.0 (2017-01-24)
 * [xen-ocaml] Add support for OCaml 4.04.0 (#173, by @yomimono)
 * don't embed Str into the ocaml runtime (#175, by @hannesm)

unix/_oasis

@@ -1,6 +1,6 @@
 OASISFormat: 0.4
 Name:        mirage-xen
-Version:     2.6.0
+Version:     3.0.1
 Synopsis:    Library support for the Mirage/Unix backend
 Authors:     Anil Madhavapeddy, Dave Scott, Thomas Gazagnaire, Thomas Leonard
 License:     ISC

unix/lib/META

@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: e0afbc0f9a0abd9b66a7570405841ac3)
-version = "2.6.0"
+# DO NOT EDIT (digest: 9351c5f5d3d38eb92467cdd3491e42a7)
+version = "3.0.1"
 description = "Library support for the Mirage/Unix backend"
 requires = "cstruct lwt lwt.unix io-page.unix io-page mirage-clock-unix logs"
 archive(byte) = "OS.cma"

unix/myocamlbuild.ml

@@ -1,5 +1,5 @@
 (* OASIS_START *)
-(* DO NOT EDIT (digest: abb4659aa302475da4cd11d815511bff) *)
+(* DO NOT EDIT (digest: 6138eb169b7fd3d38bdc7b1f857e15c6) *)
 module OASISGettext = struct
 (* # 22 "src/oasis/OASISGettext.ml" *)
 
@@ -105,10 +105,7 @@ module OASISString = struct
         ok := false;
       incr str_idx
     done;
-    if !what_idx = String.length what then
-      true
-    else
-      false
+    !what_idx = String.length what
 
 
   let strip_starts_with ~what str =
@@ -131,10 +128,7 @@ module OASISString = struct
         ok := false;
       decr str_idx
     done;
-    if !what_idx = -1 then
-      true
-    else
-      false
+    !what_idx = -1
 
 
   let strip_ends_with ~what str =
@@ -440,7 +434,7 @@ module OASISExpr = struct
 end
 
 
-# 443 "myocamlbuild.ml"
+# 437 "myocamlbuild.ml"
 module BaseEnvLight = struct
 (* # 22 "src/base/BaseEnvLight.ml" *)
 
@@ -520,7 +514,7 @@ module BaseEnvLight = struct
 end
 
 
-# 523 "myocamlbuild.ml"
+# 517 "myocamlbuild.ml"
 module MyOCamlbuildFindlib = struct
 (* # 22 "src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
 
@@ -746,6 +740,9 @@ module MyOCamlbuildBase = struct
 (* # 110 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
 
 
+  let env_filename = Pathname.basename BaseEnvLight.default_filename
+
+
   let dispatch_combine lst =
     fun e ->
       List.iter
@@ -878,7 +875,7 @@ module MyOCamlbuildBase = struct
 end
 
 
-# 881 "myocamlbuild.ml"
+# 878 "myocamlbuild.ml"
 open Ocamlbuild_plugin;;
 let package_default =
   {
@@ -893,6 +890,6 @@ let conf = {MyOCamlbuildFindlib.no_automatic_syntax = false}
 
 let dispatch_default = MyOCamlbuildBase.dispatch_default conf package_default;;
 
-# 897 "myocamlbuild.ml"
+# 894 "myocamlbuild.ml"
 (* OASIS_STOP *)
 Ocamlbuild_plugin.dispatch dispatch_default;;

unix/setup.ml

@@ -1,9 +1,9 @@
 (* setup.ml generated for the first time by OASIS v0.4.5 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: e3d4a93fc848c3e09028527cd267b038) *)
+(* DO NOT EDIT (digest: 89e5d1c79cd7017a31f68adde817353f) *)
 (*
-   Regenerated by OASIS v0.4.7
+   Regenerated by OASIS v0.4.10
    Visit http://oasis.forge.ocamlcore.org for more information and
    documentation about functions used in this file.
 *)
@@ -112,10 +112,7 @@ module OASISString = struct
         ok := false;
       incr str_idx
     done;
-    if !what_idx = String.length what then
-      true
-    else
-      false
+    !what_idx = String.length what
 
 
   let strip_starts_with ~what str =
@@ -138,10 +135,7 @@ module OASISString = struct
         ok := false;
       decr str_idx
     done;
-    if !what_idx = -1 then
-      true
-    else
-      false
+    !what_idx = -1
 
 
   let strip_ends_with ~what str =
@@ -658,6 +652,7 @@ module OASISContext = struct
       ignore_unknown_fields: bool;
       printf:                level -> string -> unit;
       srcfs:                 source OASISFileSystem.fs;
+      load_oasis_plugin:     string -> bool;
     }
 
 
@@ -682,6 +677,7 @@ module OASISContext = struct
         ignore_unknown_fields = false;
         printf                = printf;
         srcfs                 = new OASISFileSystem.host_fs(Sys.getcwd ());
+        load_oasis_plugin     = (fun _ -> false);
       }
 
 
@@ -3160,7 +3156,7 @@ module OASISFileUtil = struct
 end
 
 
-# 3163 "setup.ml"
+# 3159 "setup.ml"
 module BaseEnvLight = struct
 (* # 22 "src/base/BaseEnvLight.ml" *)
 
@@ -3240,7 +3236,7 @@ module BaseEnvLight = struct
 end
 
 
-# 3243 "setup.ml"
+# 3239 "setup.ml"
 module BaseContext = struct
 (* # 22 "src/base/BaseContext.ml" *)
 
@@ -5663,7 +5659,7 @@ module BaseCompat = struct
 end
 
 
-# 5666 "setup.ml"
+# 5662 "setup.ml"
 module InternalConfigurePlugin = struct
 (* # 22 "src/plugins/internal/InternalConfigurePlugin.ml" *)
 
@@ -6014,17 +6010,14 @@ module InternalInstallPlugin = struct
 
   let install =
 
-    let in_destdir =
+    let in_destdir fn =
       try
-        let destdir =
-          destdir ()
-        in
-          (* Practically speaking destdir is prepended
-           * at the beginning of the target filename
-           *)
-          fun fn -> destdir^fn
+        (* Practically speaking destdir is prepended at the beginning of the
+           target filename
+        *)
+        (destdir ())^fn
       with PropList.Not_set _ ->
-        fun fn -> fn
+        fn
     in
 
     let install_file ~ctxt ?(prepend_destdir=true) ?tgt_fn src_file envdir =
@@ -6469,7 +6462,7 @@ module InternalInstallPlugin = struct
 end
 
 
-# 6472 "setup.ml"
+# 6465 "setup.ml"
 module OCamlbuildCommon = struct
 (* # 22 "src/plugins/ocamlbuild/OCamlbuildCommon.ml" *)
 
@@ -6826,11 +6819,10 @@ module OCamlbuildDocPlugin = struct
     run_ocamlbuild ~ctxt (index_html :: run.extra_args) argv;
     List.iter
       (fun glb ->
-         BaseBuilt.register
-           ~ctxt
-           BaseBuilt.BDoc
-           cs.cs_name
-           [OASISFileUtil.glob ~ctxt (Filename.concat tgt_dir glb)])
+         match OASISFileUtil.glob ~ctxt (Filename.concat tgt_dir glb) with
+         | (_ :: _) as filenames ->
+             BaseBuilt.register ~ctxt BaseBuilt.BDoc cs.cs_name [filenames]
+         | [] -> ())
       ["*.html"; "*.css"]
 
 
@@ -6842,7 +6834,7 @@ module OCamlbuildDocPlugin = struct
 end
 
 
-# 6845 "setup.ml"
+# 6837 "setup.ml"
 open OASISTypes;;
 
 let setup_t =
@@ -6863,7 +6855,7 @@ let setup_t =
        {
           oasis_version = "0.4";
           ocaml_version = None;
-          version = "2.6.0";
+          version = "3.0.1";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
@@ -7087,16 +7079,16 @@ let setup_t =
           plugin_data = []
        };
      oasis_fn = Some "_oasis";
-     oasis_version = "0.4.7";
-     oasis_digest = Some "\143\252G\2500d9d,\247\r\012\168\023\2271";
+     oasis_version = "0.4.10";
+     oasis_digest = Some "{\206\248`\239BP\214)O\242V\217\214\190\171";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
   };;
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 7100 "setup.ml"
+# 7092 "setup.ml"
 let setup_t = BaseCompat.Compat_0_4.adapt_setup_t setup_t
 open BaseCompat.Compat_0_4
 (* OASIS_STOP *)

xen/_oasis

@@ -1,6 +1,6 @@
 OASISFormat: 0.4
 Name:        mirage-xen
-Version:     2.6.0
+Version:     3.0.1
 Synopsis:    Library support for the Mirage/Xen backend
 Authors:     Anil Madhavapeddy, Dave Scott, Thomas Gazagnaire, Thomas Leonard
 License:     ISC

xen/lib/META

@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: 106e1d383e2c1fe9710ba543ff341477)
-version = "2.6.0"
+# DO NOT EDIT (digest: 3a3a3bfdf7063471164fac5e46568468)
+version = "3.0.1"
 description = "Library support for the Mirage/Xen backend"
 requires =
 "lwt cstruct xen-evtchn xen-gnt xenstore.client shared-memory-ring shared-memory-ring-lwt mirage-clock-freestanding io-page mirage-profile logs"

xen/setup.ml

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.5 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 7973cd260f1517ebe1c89648ec484065) *)
+(* DO NOT EDIT (digest: e06fbf007c54952aad1bd42ef13c093e) *)
 (*
    Regenerated by OASIS v0.4.10
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6855,7 +6855,7 @@ let setup_t =
        {
           oasis_version = "0.4";
           ocaml_version = None;
-          version = "2.6.0";
+          version = "3.0.1";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
@@ -7097,16 +7097,15 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.10";
-     oasis_digest =
-       Some "\189b\241\170\030\175\168ZM\027\132\027\238Y\183\179";
+     oasis_digest = Some "\194MwD=\1468\220\127$\148\012P\187-\128";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
   };;
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 7110 "setup.ml"
+# 7109 "setup.ml"
 let setup_t = BaseCompat.Compat_0_4.adapt_setup_t setup_t
 open BaseCompat.Compat_0_4
 (* OASIS_STOP *)