mirage-unix: remove superfluous io-page* dependency

mirage-unix.opam

@@ -14,7 +14,6 @@ depends: [
   "ocamlbuild" {build}
   "cstruct" {>= "1.0.1"}
   "lwt" {>= "2.4.3"}
-  "io-page" {>= "1.5.0"}
   "mirage-clock-unix" {>= "1.0.0"}
   "shared-memory-ring" {>= "1.0.0"}
   "mirage-profile" {>= "0.3"}

unix/_oasis

@@ -12,4 +12,4 @@ Library "OS"
   Findlibname: mirage-unix
   Pack: true
   Modules: Env, Lifecycle, Main, Time
-  BuildDepends:	cstruct, lwt, lwt.unix, io-page.unix, io-page, mirage-clock-unix, logs
+  BuildDepends:	cstruct, lwt, lwt.unix, mirage-clock-unix, logs

unix/_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 67d406ee30dbd2eb32c1d0f74437fa33)
+# DO NOT EDIT (digest: f0b588c44230b2d6e3d8d383a2cbe882)
 # 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
@@ -21,8 +21,6 @@ true: annot, bin_annot
 "lib/main.cmx": for-pack(OS)
 "lib/time.cmx": for-pack(OS)
 <lib/*.ml{,i,y}>: pkg_cstruct
-<lib/*.ml{,i,y}>: pkg_io-page
-<lib/*.ml{,i,y}>: pkg_io-page.unix
 <lib/*.ml{,i,y}>: pkg_logs
 <lib/*.ml{,i,y}>: pkg_lwt
 <lib/*.ml{,i,y}>: pkg_lwt.unix

unix/lib/META

@@ -1,8 +1,8 @@
 # OASIS_START
-# DO NOT EDIT (digest: 9351c5f5d3d38eb92467cdd3491e42a7)
+# DO NOT EDIT (digest: fe6410c8e8c9d279c2e7a83b749ea874)
 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"
+requires = "cstruct lwt lwt.unix mirage-clock-unix logs"
 archive(byte) = "OS.cma"
 archive(byte, plugin) = "OS.cma"
 archive(native) = "OS.cmxa"

unix/myocamlbuild.ml

@@ -1,5 +1,5 @@
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 6138eb169b7fd3d38bdc7b1f857e15c6) *)
+(* DO NOT EDIT (digest: 3522b494e2ffb1d9f2067af1ecbf387d) *)
 module OASISGettext = struct
 (* # 22 "src/oasis/OASISGettext.ml" *)
 
@@ -105,7 +105,10 @@ module OASISString = struct
         ok := false;
       incr str_idx
     done;
-    !what_idx = String.length what
+    if !what_idx = String.length what then
+      true
+    else
+      false
 
 
   let strip_starts_with ~what str =
@@ -128,7 +131,10 @@ module OASISString = struct
         ok := false;
       decr str_idx
     done;
-    !what_idx = -1
+    if !what_idx = -1 then
+      true
+    else
+      false
 
 
   let strip_ends_with ~what str =
@@ -434,7 +440,7 @@ module OASISExpr = struct
 end
 
 
-# 437 "myocamlbuild.ml"
+# 443 "myocamlbuild.ml"
 module BaseEnvLight = struct
 (* # 22 "src/base/BaseEnvLight.ml" *)
 
@@ -514,7 +520,7 @@ module BaseEnvLight = struct
 end
 
 
-# 517 "myocamlbuild.ml"
+# 523 "myocamlbuild.ml"
 module MyOCamlbuildFindlib = struct
 (* # 22 "src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
 
@@ -875,7 +881,7 @@ module MyOCamlbuildBase = struct
 end
 
 
-# 878 "myocamlbuild.ml"
+# 884 "myocamlbuild.ml"
 open Ocamlbuild_plugin;;
 let package_default =
   {
@@ -890,6 +896,6 @@ let conf = {MyOCamlbuildFindlib.no_automatic_syntax = false}
 
 let dispatch_default = MyOCamlbuildBase.dispatch_default conf package_default;;
 
-# 894 "myocamlbuild.ml"
+# 900 "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: 89e5d1c79cd7017a31f68adde817353f) *)
+(* DO NOT EDIT (digest: ac2748ec9b7df66f01cb220c6b7a6762) *)
 (*
-   Regenerated by OASIS v0.4.10
+   Regenerated by OASIS v0.4.8
    Visit http://oasis.forge.ocamlcore.org for more information and
    documentation about functions used in this file.
 *)
@@ -112,7 +112,10 @@ module OASISString = struct
         ok := false;
       incr str_idx
     done;
-    !what_idx = String.length what
+    if !what_idx = String.length what then
+      true
+    else
+      false
 
 
   let strip_starts_with ~what str =
@@ -135,7 +138,10 @@ module OASISString = struct
         ok := false;
       decr str_idx
     done;
-    !what_idx = -1
+    if !what_idx = -1 then
+      true
+    else
+      false
 
 
   let strip_ends_with ~what str =
@@ -3156,7 +3162,7 @@ module OASISFileUtil = struct
 end
 
 
-# 3159 "setup.ml"
+# 3165 "setup.ml"
 module BaseEnvLight = struct
 (* # 22 "src/base/BaseEnvLight.ml" *)
 
@@ -3236,7 +3242,7 @@ module BaseEnvLight = struct
 end
 
 
-# 3239 "setup.ml"
+# 3245 "setup.ml"
 module BaseContext = struct
 (* # 22 "src/base/BaseContext.ml" *)
 
@@ -5659,7 +5665,7 @@ module BaseCompat = struct
 end
 
 
-# 5662 "setup.ml"
+# 5668 "setup.ml"
 module InternalConfigurePlugin = struct
 (* # 22 "src/plugins/internal/InternalConfigurePlugin.ml" *)
 
@@ -6010,14 +6016,17 @@ module InternalInstallPlugin = struct
 
   let install =
 
-    let in_destdir fn =
+    let in_destdir =
       try
-        (* Practically speaking destdir is prepended at the beginning of the
-           target filename
-        *)
-        (destdir ())^fn
+        let destdir =
+          destdir ()
+        in
+          (* Practically speaking destdir is prepended
+           * at the beginning of the target filename
+           *)
+          fun fn -> destdir^fn
       with PropList.Not_set _ ->
-        fn
+        fun fn -> fn
     in
 
     let install_file ~ctxt ?(prepend_destdir=true) ?tgt_fn src_file envdir =
@@ -6462,7 +6471,7 @@ module InternalInstallPlugin = struct
 end
 
 
-# 6465 "setup.ml"
+# 6474 "setup.ml"
 module OCamlbuildCommon = struct
 (* # 22 "src/plugins/ocamlbuild/OCamlbuildCommon.ml" *)
 
@@ -6819,10 +6828,11 @@ module OCamlbuildDocPlugin = struct
     run_ocamlbuild ~ctxt (index_html :: run.extra_args) argv;
     List.iter
       (fun glb ->
-         match OASISFileUtil.glob ~ctxt (Filename.concat tgt_dir glb) with
-         | (_ :: _) as filenames ->
-             BaseBuilt.register ~ctxt BaseBuilt.BDoc cs.cs_name [filenames]
-         | [] -> ())
+         BaseBuilt.register
+           ~ctxt
+           BaseBuilt.BDoc
+           cs.cs_name
+           [OASISFileUtil.glob ~ctxt (Filename.concat tgt_dir glb)])
       ["*.html"; "*.css"]
 
 
@@ -6834,7 +6844,7 @@ module OCamlbuildDocPlugin = struct
 end
 
 
-# 6837 "setup.ml"
+# 6847 "setup.ml"
 open OASISTypes;;
 
 let setup_t =
@@ -6903,8 +6913,6 @@ let setup_t =
                            FindlibPackage ("cstruct", None);
                            FindlibPackage ("lwt", None);
                            FindlibPackage ("lwt.unix", None);
-                           FindlibPackage ("io-page.unix", None);
-                           FindlibPackage ("io-page", None);
                            FindlibPackage ("mirage-clock-unix", None);
                            FindlibPackage ("logs", None)
                         ];
@@ -7079,16 +7087,16 @@ let setup_t =
           plugin_data = []
        };
      oasis_fn = Some "_oasis";
-     oasis_version = "0.4.10";
-     oasis_digest = Some "{\206\248`\239BP\214)O\242V\217\214\190\171";
+     oasis_version = "0.4.8";
+     oasis_digest = Some "&\rJY\244s\160\251g\136\015\177\143\144|\143";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
   };;
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 7092 "setup.ml"
+# 7100 "setup.ml"
 let setup_t = BaseCompat.Compat_0_4.adapt_setup_t setup_t
 open BaseCompat.Compat_0_4
 (* OASIS_STOP *)