[Pkg-ocaml-maint-commits] [SCM] oasis2debian project branch, master, updated. a85c25dc2305eccf3507acf59d7cbbc09b4201dc

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit d1df07ff2a97c9b99d6af247dfc380bce3ed3b2f
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Wed Feb 9 10:55:13 2011 +0000

    Only rely on has_cmi for dh files, not on has_hinterf.

diff --git a/src/DhFiles.ml b/src/DhFiles.ml
index 6d7e555..fe25b00 100644
--- a/src/DhFiles.ml
+++ b/src/DhFiles.ml
@@ -33,7 +33,6 @@ type t =
     has_byte:     bool;
     has_native:   bool;
     has_dll:      bool;
-    has_hinterf:  bool;
     has_cmi:      bool;
   }
 
@@ -86,13 +85,6 @@ let create ~ctxt t =
                   libs))
          in
 
-         let () = 
-           prerr_endline "----";
-           List.iter 
-             prerr_endline 
-             generated_files
-         in
-           
          let has_extensions exts = 
            List.fold_left
              (fun acc ext ->
@@ -110,7 +102,6 @@ let create ~ctxt t =
              has_native   = has_extensions [".cmxa"; ".cmx"];
              has_byte     = has_extensions [".cma"; ".cmo"];
              has_cmi      = has_extensions [".cmi"];
-             has_hinterf  = has_extensions [".ml"; ".mli"];
            })
 
       findlib_roots
@@ -136,7 +127,7 @@ let create ~ctxt t =
     if not has_apidoc && 
        (* API doc is not already generated *)
 
-       List.exists (fun e -> e.has_hinterf) roots then
+       List.exists (fun e -> e.has_cmi) roots then
        (* There are .mli/.ml to create API doc *)
 
       begin
@@ -254,7 +245,7 @@ Section: Programming/OCaml");
                                "@OCamlStdlibDir@/$e.findlib_name/*.cmi")
                             chn;
 
-                        if e.has_hinterf then
+                        if e.has_cmi then
                           output_content 
                             (interpolate 
                                "@OCamlStdlibDir@/$e.findlib_name/*.ml*")

-- 
oasis2debian project