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

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 00150476a93db9c60b8a3bde96766a3bba2fb9a2
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Sun Mar 17 01:27:45 2013 +0100

    Avoid generating .cmxs install when not available.

diff --git a/INSTALL.txt b/INSTALL.txt
index 05e7826..357d694 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,5 +1,5 @@
 (* OASIS_START *)
-(* DO NOT EDIT (digest: c0deed2e3849bcbb630b6c2be2fcfbbb) *)
+(* DO NOT EDIT (digest: 96893f4af218c48c9d244581d361e83f) *)
 This is the INSTALL file for the oasis2debian distribution.
 
 This package uses OASIS to generate its build system. See section OASIS for
@@ -11,7 +11,7 @@ Dependencies
 In order to compile this package, you will need:
 * ocaml for all, test main, test ocaml-sqlexpr
 * findlib
-* oasis (>= 0.2.0) for executable oasis2debian
+* oasis (>= 0.3.1) for executable oasis2debian
 * xstrp4 (>= 1.8) for executable oasis2debian
 * fileutils (>= 0.4.2)
 * pcre for executable oasis2debian
diff --git a/_oasis b/_oasis
index 682629a..2950d5f 100644
--- a/_oasis
+++ b/_oasis
@@ -12,7 +12,7 @@ FilesAB:     src/Version.ml.ab
 Executable oasis2debian
   Path:         src
   MainIs:       Main.ml
-  BuildDepends: oasis (>= 0.2.0), oasis.base, 
+  BuildDepends: oasis (>= 0.3.1), oasis.base, 
                 xstrp4 (>= 1.8), 
                 fileutils (>= 0.4.2), 
                 pcre, 
diff --git a/setup.ml b/setup.ml
index 9f796bc..9b146a4 100644
--- a/setup.ml
+++ b/setup.ml
@@ -22,7 +22,7 @@
 (* setup.ml generated for the first time by OASIS v0.2.0 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: df22b09b59ae960206ea17721a124c09) *)
+(* DO NOT EDIT (digest: cfc30cfd0f049b7818469a97793a903b) *)
 (*
    Regenerated by OASIS v0.3.1
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6116,7 +6116,7 @@ let setup_t =
                         [
                            FindlibPackage
                              ("oasis",
-                               Some (OASISVersion.VGreaterEqual "0.2.0"));
+                               Some (OASISVersion.VGreaterEqual "0.3.1"));
                            FindlibPackage ("oasis.base", None);
                            FindlibPackage
                              ("xstrp4",
@@ -6245,7 +6245,7 @@ let setup_t =
           };
      oasis_fn = Some "_oasis";
      oasis_version = "0.3.1";
-     oasis_digest = Some "\173|\251M\182\020H\240\221\187<\161g>Sp";
+     oasis_digest = Some "ö¨­7ù¡ývM[\153~røjß";
      oasis_exec = None;
      oasis_setup_args = ["-setup-update"; "weak"];
      setup_update = true;
diff --git a/src/DhFiles.ml b/src/DhFiles.ml
index 7bcb256..f23ea90 100644
--- a/src/DhFiles.ml
+++ b/src/DhFiles.ml
@@ -34,7 +34,7 @@ type t =
     has_native:   bool;
     has_dll:      bool;
     has_cmi:      bool;
-    (* TODO: dynlink *)
+    has_cmxs:     bool;
   }
 
 let create ~ctxt t = 
@@ -79,7 +79,9 @@ let create ~ctxt t =
                                ~ctxt
                                ~source_file_exists:Sys.file_exists
                                ~is_native:true
-                               ~has_native_dynlink:true
+                               ~has_native_dynlink:
+                               (bool_of_string 
+                                  (BaseStandardVar.native_dynlink ()))
                                ~ext_lib:".a"
                                ~ext_dll:".so"
                                (cs, bs, lib)
@@ -115,6 +117,7 @@ let create ~ctxt t =
              has_native   = has_extensions [".cmxa"; ".cmx"];
              has_byte     = has_extensions [".cma"; ".cmo"];
              has_cmi      = has_extensions [".cmi"];
+             has_cmxs     = has_extensions [".cmxs"];
            })
 
       findlib_roots
@@ -326,7 +329,7 @@ Section: Programming/OCaml");
                             (interpolate
                                "@OCamlStdlibDir@/$e.findlib_name/*.cm[ao]")
                             chn;
-                        if e.has_native then
+                        if e.has_cmxs then
                           output_content
                             (interpolate 
                                "@OCamlStdlibDir@/$e.findlib_name/*.cmxs")

-- 
oasis2debian project