Merge pull request mirage#7 from avsm/master

bump version to 1.5.0, since the Re_str dependency removal can break ups...

CHANGES

@@ -1,4 +1,4 @@
-1.4.1 (2014-03-24):
+1.5.0 (2014-03-24):
 * Make library POSIX thread-safe by removing dependency on `Re_str`.
 * Add Merlin IDE configuration.
 

_oasis

@@ -1,6 +1,6 @@
 OASISFormat: 0.4
 Name:        uri
-Version:     1.4.1
+Version:     1.5.0
 Synopsis:    RFC3986 URI parsing library
 Description: Uniform Resource Identifier (URI) parsing and encoding.
   This is pure OCaml code.

lib/META

@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: b5aca2bdf3382e7df6198beecaf8fa9c)
-version = "1.4.1"
+# DO NOT EDIT (digest: 572478ea9a222728960c2d51a6a05e85)
+version = "1.5.0"
 description = "RFC3986 URI parsing library"
 requires = "re.posix stringext sexplib.syntax sexplib"
 archive(byte) = "uri.cma"
@@ -9,7 +9,7 @@ archive(native) = "uri.cmxa"
 archive(native, plugin) = "uri.cmxs"
 exists_if = "uri.cma"
 package "top" (
- version = "1.4.1"
+ version = "1.5.0"
  description = "Toplevel printers for URIs"
  requires = "uri"
  archive(byte) = "uri_top.cma"
@@ -20,7 +20,7 @@ package "top" (
 )
 
 package "services_full" (
- version = "1.4.1"
+ version = "1.5.0"
  description = "RFC3986 URI parsing library"
  requires = "uri"
  archive(byte) = "services_full.cma"
@@ -31,7 +31,7 @@ package "services_full" (
 )
 
 package "services" (
- version = "1.4.1"
+ version = "1.5.0"
  description = "RFC3986 URI parsing library"
  requires = "uri"
  archive(byte) = "services.cma"

myocamlbuild.ml

@@ -1,5 +1,5 @@
 (* OASIS_START *)
-(* DO NOT EDIT (digest: ab94815a67f544e7897f8a58e0eb3e28) *)
+(* DO NOT EDIT (digest: 38d2cc0fd01a0bfe4767902b8b89f720) *)
 module OASISGettext = struct
 (* # 22 "src/oasis/OASISGettext.ml" *)
 
@@ -259,6 +259,31 @@ module MyOCamlbuildFindlib = struct
     Ocamlbuild_pack.Lexers.blank_sep_strings
 
 
+  let exec_from_conf exec =
+    let exec =
+      let env_filename = Pathname.basename BaseEnvLight.default_filename in
+      let env = BaseEnvLight.load ~filename:env_filename ~allow_empty:true () in
+      try
+        BaseEnvLight.var_get exec env
+      with Not_found ->
+        Printf.eprintf "W: Cannot get variable %s\n" exec;
+        exec
+    in
+    let fix_win32 str =
+      if Sys.os_type = "Win32" then begin
+        let buff = Buffer.create (String.length str) in
+        (* Adapt for windowsi, ocamlbuild + win32 has a hard time to handle '\\'.
+         *)
+        String.iter
+          (fun c -> Buffer.add_char buff (if c = '\\' then '/' else c))
+          str;
+        Buffer.contents buff
+      end else begin
+        str
+      end
+    in
+      fix_win32 exec
+
   let split s ch =
     let buf = Buffer.create 13 in
     let x = ref [] in
@@ -286,17 +311,7 @@ module MyOCamlbuildFindlib = struct
     with Not_found -> s
 
   (* ocamlfind command *)
-  let ocamlfind x =
-    let ocamlfind_prog =
-      let env_filename = Pathname.basename BaseEnvLight.default_filename in
-      let env = BaseEnvLight.load ~filename:env_filename ~allow_empty:true () in
-      try
-        BaseEnvLight.var_get "ocamlfind" env
-      with Not_found ->
-        Printf.eprintf "W: Cannot get variable ocamlfind";
-        "ocamlfind"
-    in
-      S[Sh ocamlfind_prog; x]
+  let ocamlfind x = S[Sh (exec_from_conf "ocamlfind"); x]
 
   (* This lists all supported packages. *)
   let find_packages () =
@@ -325,7 +340,7 @@ module MyOCamlbuildFindlib = struct
 
   let dispatch =
     function
-      | Before_options ->
+      | After_options ->
           (* By using Before_options one let command line options have an higher
            * priority on the contrary using After_options will guarantee to have
            * the higher priority override default commands by ocamlfind ones *)
@@ -476,7 +491,7 @@ module MyOCamlbuildBase = struct
                    try
                      opt := no_trailing_dot (BaseEnvLight.var_get var env)
                    with Not_found ->
-                     Printf.eprintf "W: Cannot get variable %s" var)
+                     Printf.eprintf "W: Cannot get variable %s\n" var)
                 [
                   Options.ext_obj, "ext_obj";
                   Options.ext_lib, "ext_lib";
@@ -576,7 +591,7 @@ module MyOCamlbuildBase = struct
 end
 
 
-# 579 "myocamlbuild.ml"
+# 594 "myocamlbuild.ml"
 open Ocamlbuild_plugin;;
 let package_default =
   {
@@ -595,7 +610,7 @@ let package_default =
 
 let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;
 
-# 599 "myocamlbuild.ml"
+# 614 "myocamlbuild.ml"
 (* OASIS_STOP *)
 
 let () =