[Pkg-ocaml-maint-commits] [SCM] menhir packaging branch, master, updated. debian/20090204.dfsg-2-9-g4023840

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 2a29ba3422901f1d2e6229d1952f3091360349b4
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Wed Jun 24 23:04:36 2009 +0200

    Imported Upstream version 20090505.dfsg

diff --git a/AUTHORS b/AUTHORS
index 69d296f..2def04c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,2 @@
 François Pottier <Francois.Pottier at inria.fr>
-Yann Régis-Gianas <Yann.Regis-Gianas at inria.fr>
+Yann Régis-Gianas <Yann.Regis-Gianas at pps.jussieu.fr>
diff --git a/CHANGES b/CHANGES
index da34b82..ef0f6ad 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+2009/02/06:
+Fixed ocamldep.wrapper to avoid quoting the name of the ocaml command.
+This is hoped to fix a compilation problem under MinGW.
+
 2009/02/04:
 A Makefile fix to avoid a problem under Windows/Cygwin.
 Renamed the ocaml-check-version script so as to avoid a warning.
diff --git a/INSTALL b/INSTALLATION
similarity index 100%
rename from INSTALL
rename to INSTALLATION
diff --git a/demos/ocamldep.wrapper b/demos/ocamldep.wrapper
index 3cbe736..64024c6 100755
--- a/demos/ocamldep.wrapper
+++ b/demos/ocamldep.wrapper
@@ -24,16 +24,28 @@ let rec loop accumulating i =
   if i = Array.length Sys.argv then
     ()
   else if accumulating then
+    (* [accumulating] is [true] as long as we have not found the "-" marker *)
     match Sys.argv.(i) with
     | "-v" ->
 	verbose := true;
 	loop true (i+1)
     | "-" ->
+        (* We have found the marker. The next parameter should be the name of
+	   the raw [ocamldep] command. Copy it to the command (unquoted --
+	   apparently some shells do not permit quoting a command name). *)
+	let i = i + 1 in
+	assert (i < Array.length Sys.argv);
+	command := Sys.argv.(i);
+	(* Stop accumulating file names. Copy the remaining arguments into
+	   the command. *)
 	loop false (i+1)
     | _ ->
+        (* Continue accumulating file names in [xs]. *)
 	xs := Sys.argv.(i) :: !xs;
 	loop true (i+1)
   else begin
+    (* After we have found the "-" marker, the remaining arguments are
+       copied (quoted) into the command. *)
     command := sprintf "%s %s" !command (Filename.quote Sys.argv.(i));
     loop false (i+1)
   end
@@ -74,4 +86,3 @@ let rec loop = function
 
 let () =
   exit (loop !xs)
-
diff --git a/src/Makefile b/src/Makefile
index cac9bba..d8a5df6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -249,4 +249,8 @@ clean::
 
 # Building menhirLib.
 
+ifeq ($(TARGET),byte)
+lib: menhirLib.cmo menhirLib.cmi
+else
 lib: menhirLib.cmo menhirLib.cmi menhirLib.cmx menhirLib.o
+endif
diff --git a/src/version.ml b/src/version.ml
index 0fb04aa..cfe84e9 100644
--- a/src/version.ml
+++ b/src/version.ml
@@ -1 +1 @@
-let version = "20090204"
+let version = "20090505"

-- 
menhir packaging