Update OASIS version.

_oasis

@@ -1,6 +1,6 @@
 OASISFormat:    0.4
 Name:           oasis
-Version:        0.4.10
+Version:        0.4.11~HEAD
 OCamlVersion:   >= 3.12.1
 FindlibVersion: >= 1.3.1
 LicenseFile:    COPYING.txt

myocamlbuild.ml

@@ -107,7 +107,7 @@ rule "ocamlify: %.mlify & %.mlify.depends -> %.ml"
 ;;
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 633b0066c73729b3e64d982560de2e3b) *)
+(* DO NOT EDIT (digest: abd4c3624ec7c742aae7dbd96c89cd14) *)
 module OASISGettext = struct
 # 22 "src/oasis/OASISGettext.ml"
 
@@ -213,10 +213,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 =
@@ -239,10 +236,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 =
@@ -548,7 +542,7 @@ module OASISExpr = struct
 end
 
 
-# 443 "myocamlbuild.ml"
+# 437 "myocamlbuild.ml"
 module BaseEnvLight = struct
 # 22 "src/base/BaseEnvLight.ml"
 
@@ -628,7 +622,7 @@ module BaseEnvLight = struct
 end
 
 
-# 523 "myocamlbuild.ml"
+# 517 "myocamlbuild.ml"
 module MyOCamlbuildFindlib = struct
 # 22 "src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml"
 
@@ -989,7 +983,7 @@ module MyOCamlbuildBase = struct
 end
 
 
-# 884 "myocamlbuild.ml"
+# 878 "myocamlbuild.ml"
 open Ocamlbuild_plugin;;
 let package_default =
   {
@@ -1289,7 +1283,7 @@ let conf = {MyOCamlbuildFindlib.no_automatic_syntax = false}
 
 let dispatch_default = MyOCamlbuildBase.dispatch_default conf package_default;;
 
-# 1185 "myocamlbuild.ml"
+# 1179 "myocamlbuild.ml"
 (* OASIS_STOP *)
 
 open Ocamlbuild_plugin;;

setup.ml

@@ -21,9 +21,9 @@
 (******************************************************************************)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: b708094a4875dabbf424971428e01cba) *)
+(* DO NOT EDIT (digest: 7d4cc812981f9f9e67cacbdc2ede60b6) *)
 (*
-   Regenerated by OASIS v0.4.8
+   Regenerated by OASIS v0.4.10~HEAD
    Visit http://oasis.forge.ocamlcore.org for more information and
    documentation about functions used in this file.
 *)
@@ -132,10 +132,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 =
@@ -158,10 +155,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 =
@@ -3182,7 +3176,7 @@ module OASISFileUtil = struct
 end
 
 
-# 3165 "setup.ml"
+# 3159 "setup.ml"
 module BaseEnvLight = struct
 # 22 "src/base/BaseEnvLight.ml"
 
@@ -3262,7 +3256,7 @@ module BaseEnvLight = struct
 end
 
 
-# 3245 "setup.ml"
+# 3239 "setup.ml"
 module BaseContext = struct
 # 22 "src/base/BaseContext.ml"
 
@@ -5685,7 +5679,7 @@ module BaseCompat = struct
 end
 
 
-# 5668 "setup.ml"
+# 5662 "setup.ml"
 module InternalConfigurePlugin = struct
 # 22 "src/plugins/internal/InternalConfigurePlugin.ml"
 
@@ -6036,17 +6030,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 =
@@ -6491,7 +6482,7 @@ module InternalInstallPlugin = struct
 end
 
 
-# 6474 "setup.ml"
+# 6465 "setup.ml"
 module OCamlbuildCommon = struct
 # 22 "src/plugins/ocamlbuild/OCamlbuildCommon.ml"
 
@@ -6848,11 +6839,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"]
 
 
@@ -6864,7 +6854,7 @@ module OCamlbuildDocPlugin = struct
 end
 
 
-# 6847 "setup.ml"
+# 6837 "setup.ml"
 module CustomPlugin = struct
 # 22 "src/plugins/custom/CustomPlugin.ml"
 
@@ -6996,7 +6986,7 @@ module CustomPlugin = struct
 end
 
 
-# 6979 "setup.ml"
+# 6969 "setup.ml"
 open OASISTypes;;
 
 let setup_t =
@@ -7368,7 +7358,7 @@ let setup_t =
        {
           oasis_version = "0.4";
           ocaml_version = Some (OASISVersion.VGreaterEqual "3.12.1");
-          version = "0.4.10";
+          version = "0.4.11~HEAD";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
@@ -11792,17 +11782,16 @@ let setup_t =
           plugin_data = []
        };
      oasis_fn = Some "_oasis";
-     oasis_version = "0.4.8";
-     oasis_digest =
-       Some "\182\141\235\016\205\021\241\230\243\205\028\228\152Ia\194";
+     oasis_version = "0.4.10~HEAD";
+     oasis_digest = Some "y-G<*\199E`\023\022\188\143\221\235\146\027";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
   };;
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 11786 "setup.ml"
+# 11775 "setup.ml"
 let setup_t = BaseCompat.Compat_0_4.adapt_setup_t setup_t
 open BaseCompat.Compat_0_4
 (* OASIS_STOP *)

src/ext/plugin-loader/src/META

@@ -21,8 +21,8 @@
 ################################################################################
 
 # OASIS_START
-# DO NOT EDIT (digest: 719b76698fa68930c4ed962abe6a4efe)
-version = "0.4.10"
+# DO NOT EDIT (digest: 6bda718fb58063ac6859e458fd1231ac)
+version = "0.4.11~HEAD"
 description = "OCaml plugin management using findlib"
 requires = "dynlink findlib"
 archive(byte) = "plugin-loader.cma"

src/ext/plugin-loader/test/data/findlib/plugin1/META

@@ -21,8 +21,8 @@
 ################################################################################
 
 # OASIS_START
-# DO NOT EDIT (digest: 31120c1e2c6b6f55615cbf9d816946e6)
-version = "0.4.10"
+# DO NOT EDIT (digest: 03597cdd99c0b41b56d78e5e31a7a73d)
+version = "0.4.11~HEAD"
 description = "test library number 1"
 requires = "pluginloaderLib"
 archive(byte) = "plugin1.cma"

src/ext/plugin-loader/test/data/findlib/plugin2/META

@@ -21,8 +21,8 @@
 ################################################################################
 
 # OASIS_START
-# DO NOT EDIT (digest: 98de3e4ed3349b67dc050d48e0c486cb)
-version = "0.4.10"
+# DO NOT EDIT (digest: de5fcc9859e04ad1171796f7e1dae900)
+version = "0.4.11~HEAD"
 description = "test library number 2"
 requires = "pluginloaderLib plugin1"
 archive(byte) = "plugin2.cma"

src/ext/plugin-loader/test/data/findlib/plugin3/META

@@ -21,8 +21,8 @@
 ################################################################################
 
 # OASIS_START
-# DO NOT EDIT (digest: e56e2e1b5395b8d7e9df2c05f5825403)
-version = "0.4.10"
+# DO NOT EDIT (digest: 5358db037d0160632c86a653b2306bf3)
+version = "0.4.11~HEAD"
 description = "test library number 3"
 requires = "pluginloaderLib"
 archive(byte) = "plugin3.cma"

src/ext/plugin-loader/test/data/findlib/pluginloaderLib/META

@@ -21,8 +21,8 @@
 ################################################################################
 
 # OASIS_START
-# DO NOT EDIT (digest: 3be3146213cdecddba4e4d48769aae44)
-version = "0.4.10"
+# DO NOT EDIT (digest: c5f98794897a538b6f98774bdfc868a4)
+version = "0.4.11~HEAD"
 description = "test library loader"
 archive(byte) = "pluginloaderLib.cma"
 archive(byte, plugin) = "pluginloaderLib.cma"

src/oasis/META

@@ -21,8 +21,8 @@
 ################################################################################
 
 # OASIS_START
-# DO NOT EDIT (digest: 3402e76145d589e946631439a3f996d2)
-version = "0.4.10"
+# DO NOT EDIT (digest: 2bf6e655b5fe8b80ea5db2d4b56781f6)
+version = "0.4.11~HEAD"
 description = "_oasis file functions"
 requires = "unix"
 archive(byte) = "oasis.cma"
@@ -31,7 +31,7 @@ archive(native) = "oasis.cmxa"
 archive(native, plugin) = "oasis.cmxs"
 exists_if = "oasis.cma"
 package "dynrun" (
- version = "0.4.10"
+ version = "0.4.11~HEAD"
  description = "_oasis file functions"
  requires = "oasis.base oasis.builtin-plugins"
  archive(byte) = "dynrun.cma"
@@ -42,7 +42,7 @@ package "dynrun" (
 )
 
 package "cli" (
- version = "0.4.10"
+ version = "0.4.11~HEAD"
  description = "'setup.ml' modules for OASIS"
  requires = "oasis oasis.base plugin-loader"
  archive(byte) = "cli.cma"
@@ -51,7 +51,7 @@ package "cli" (
 )
 
 package "builtin-plugins" (
- version = "0.4.10"
+ version = "0.4.11~HEAD"
  description = "_oasis file functions"
  requires = "oasis oasis.base ocamlbuild"
  archive(byte) = "builtin-plugins.cma"
@@ -62,7 +62,7 @@ package "builtin-plugins" (
 )
 
 package "base" (
- version = "0.4.10"
+ version = "0.4.11~HEAD"
  description = "'setup.ml' modules for OASIS"
  requires = "oasis"
  archive(byte) = "base.cma"

test/test-common/META

@@ -21,8 +21,8 @@
 ################################################################################
 
 # OASIS_START
-# DO NOT EDIT (digest: 381b35ec152b2de8c72f4f6476a83544)
-version = "0.4.10"
+# DO NOT EDIT (digest: 72262e29ffedcd966ef295973b90794f)
+version = "0.4.11~HEAD"
 description = "Tooling for building OCaml libraries and applications"
 requires = "oUnit oasis.base fileutils pcre"
 archive(byte) = "test-common.cma"