Install missing internal module and updated Oasis

Author: mmottl

CHANGES.txt

@@ -1,3 +1,5 @@
+2014-10-29:  Fixed an installation problem due to a missing internal module.
+
 2014-10-23:  Fixed string handling for new OCaml version 4.02 (String/Bytes
              modules).  Requires new findlib version (>= 1.5).
 

_oasis

@@ -1,6 +1,6 @@
 OASISFormat:      0.4
 Name:             postgresql-ocaml
-Version:          2.1.1
+Version:          2.1.2
 Synopsis:         postgresql-ocaml - bindings to the PostgreSQL library
 Description:      postgresql-ocaml offers library functions for accessing PostgreSQL databases
 Authors:          Alain Frisch <alain.frisch@lexifi.com>,
@@ -29,15 +29,16 @@ Flag strict
   Default:        true
 
 Library postgresql
-  Path:           lib
-  FindlibName:    postgresql
-  Modules:        Postgresql
-  CSources:       postgresql_stubs.c
-  CCOpt:          -g -O2 -fPIC -DPIC
+  Path:            lib
+  FindlibName:     postgresql
+  Modules:         Postgresql
+  InternalModules: Postgresql_compat
+  CSources:        postgresql_stubs.c
+  CCOpt:           -g -O2 -fPIC -DPIC
   if flag(strict) && ccomp_type(cc)
-    CCOpt+:       -Wall -pedantic -Wextra -Wunused -Wno-long-long
-  CCLib:          -lpq
-  BuildDepends:   threads, bigarray, bytes
+    CCOpt+:        -Wall -pedantic -Wextra -Wunused -Wno-long-long
+  CCLib:           -lpq
+  BuildDepends:    threads, bigarray, bytes
 
 
 # Examples

_tags

@@ -1,8 +1,9 @@
 # OASIS_START
-# DO NOT EDIT (digest: 843c6fb516c1ba86d98cfc39f6e78629)
+# DO NOT EDIT (digest: c022991367bd814a8b8960fbd47f4298)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
+true: annot, bin_annot
 <**/.svn>: -traverse
 <**/.svn>: not_hygienic
 ".bzr": -traverse
@@ -15,17 +16,17 @@
 "_darcs": not_hygienic
 # Library postgresql
 "lib/postgresql.cmxs": use_postgresql
-<lib/*.ml{,i}>: oasis_library_postgresql_ccopt
+<lib/*.ml{,i,y}>: oasis_library_postgresql_ccopt
 "lib/postgresql_stubs.c": oasis_library_postgresql_ccopt
 <lib/postgresql.{cma,cmxa}>: oasis_library_postgresql_cclib
 "lib/libpostgresql_stubs.lib": oasis_library_postgresql_cclib
 "lib/dllpostgresql_stubs.dll": oasis_library_postgresql_cclib
 "lib/libpostgresql_stubs.a": oasis_library_postgresql_cclib
 "lib/dllpostgresql_stubs.so": oasis_library_postgresql_cclib
 <lib/postgresql.{cma,cmxa}>: use_libpostgresql_stubs
-<lib/*.ml{,i}>: pkg_bigarray
-<lib/*.ml{,i}>: pkg_bytes
-<lib/*.ml{,i}>: pkg_threads
+<lib/*.ml{,i,y}>: pkg_bigarray
+<lib/*.ml{,i,y}>: pkg_bytes
+<lib/*.ml{,i,y}>: pkg_threads
 "lib/postgresql_stubs.c": pkg_bigarray
 "lib/postgresql_stubs.c": pkg_bytes
 "lib/postgresql_stubs.c": pkg_threads
@@ -60,20 +61,20 @@
 <examples/prompt_gtk.{native,byte}>: pkg_lablgtk2
 <examples/prompt_gtk.{native,byte}>: pkg_threads
 <examples/prompt_gtk.{native,byte}>: use_postgresql
-<examples/*.ml{,i}>: pkg_lablgtk2
+<examples/*.ml{,i,y}>: pkg_lablgtk2
 # Executable test_lo
 <examples/test_lo.{native,byte}>: pkg_bigarray
 <examples/test_lo.{native,byte}>: pkg_bytes
 <examples/test_lo.{native,byte}>: pkg_threads
 <examples/test_lo.{native,byte}>: use_postgresql
-<examples/*.ml{,i}>: pkg_bigarray
-<examples/*.ml{,i}>: pkg_bytes
-<examples/*.ml{,i}>: pkg_threads
-<examples/*.ml{,i}>: use_postgresql
+<examples/*.ml{,i,y}>: pkg_bigarray
+<examples/*.ml{,i,y}>: pkg_bytes
+<examples/*.ml{,i,y}>: pkg_threads
+<examples/*.ml{,i,y}>: use_postgresql
 # OASIS_STOP
 
 true: -traverse
 <{lib,examples}/**>: traverse
 
-<**/*.ml{,i}>: warn(Aer-44), strict_sequence, safe_string, annot
+<**/*.ml{,i}>: warn(Aer-44-48), strict_sequence, safe_string, annot
 "lib/postgresql.cmxs": use_libpostgresql_stubs

lib/META

@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: 96ce45a2fe6b0b524fc6731126b5f129)
-version = "2.1.1"
+# DO NOT EDIT (digest: d47606a310e6ba80ffb3692bf4b06615)
+version = "2.1.2"
 description = "postgresql-ocaml - bindings to the PostgreSQL library"
 requires = "threads bigarray bytes"
 archive(byte) = "postgresql.cma"

lib/postgresql.mldylib

@@ -1,4 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: c26c231d9e6acbc7ff10118d262f3f5e)
+# DO NOT EDIT (digest: ffd739b43ceebd663a7de299fd616de4)
 Postgresql
+Postgresql_compat
 # OASIS_STOP

lib/postgresql.mllib

@@ -1,4 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: c26c231d9e6acbc7ff10118d262f3f5e)
+# DO NOT EDIT (digest: ffd739b43ceebd663a7de299fd616de4)
 Postgresql
+Postgresql_compat
 # OASIS_STOP

myocamlbuild.ml

@@ -1,5 +1,5 @@
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 3e1cc8469630fbc253bc2218e937c7f6) *)
+(* DO NOT EDIT (digest: 2f6db32590a6b778a4f6a9b9c2878dd1) *)
 module OASISGettext = struct
 (* # 22 "src/oasis/OASISGettext.ml" *)
 
@@ -249,6 +249,9 @@ module MyOCamlbuildFindlib = struct
     *)
   open Ocamlbuild_plugin
 
+  type conf =
+    { no_automatic_syntax: bool;
+    }
 
   (* these functions are not really officially exported *)
   let run_and_read =
@@ -315,7 +318,7 @@ module MyOCamlbuildFindlib = struct
 
   (* This lists all supported packages. *)
   let find_packages () =
-    List.map before_space (split_nl & run_and_read "ocamlfind list")
+    List.map before_space (split_nl & run_and_read (exec_from_conf "ocamlfind" ^ " list"))
 
 
   (* Mock to list available syntaxes. *)
@@ -338,7 +341,7 @@ module MyOCamlbuildFindlib = struct
   ]
 
 
-  let dispatch =
+  let dispatch conf =
     function
       | After_options ->
           (* By using Before_options one let command line options have an higher
@@ -357,31 +360,39 @@ module MyOCamlbuildFindlib = struct
            * -linkpkg *)
           flag ["ocaml"; "link"; "program"] & A"-linkpkg";
 
-          (* For each ocamlfind package one inject the -package option when
-           * compiling, computing dependencies, generating documentation and
-           * linking. *)
-          List.iter
-            begin fun pkg ->
-              let base_args = [A"-package"; A pkg] in
-              (* TODO: consider how to really choose camlp4o or camlp4r. *)
-              let syn_args = [A"-syntax"; A "camlp4o"] in
-              let args =
-              (* Heuristic to identify syntax extensions: whether they end in
-                 ".syntax"; some might not.
-               *)
-                if Filename.check_suffix pkg "syntax" ||
-                   List.mem pkg well_known_syntax then
-                  syn_args @ base_args
-                else
-                  base_args
-              in
-              flag ["ocaml"; "compile";  "pkg_"^pkg] & S args;
-              flag ["ocaml"; "ocamldep"; "pkg_"^pkg] & S args;
-              flag ["ocaml"; "doc";      "pkg_"^pkg] & S args;
-              flag ["ocaml"; "link";     "pkg_"^pkg] & S base_args;
-              flag ["ocaml"; "infer_interface"; "pkg_"^pkg] & S args;
-            end
-            (find_packages ());
+          if not (conf.no_automatic_syntax) then begin
+            (* For each ocamlfind package one inject the -package option when
+             * compiling, computing dependencies, generating documentation and
+             * linking. *)
+            List.iter
+              begin fun pkg ->
+                let base_args = [A"-package"; A pkg] in
+                (* TODO: consider how to really choose camlp4o or camlp4r. *)
+                let syn_args = [A"-syntax"; A "camlp4o"] in
+                let (args, pargs) =
+                  (* Heuristic to identify syntax extensions: whether they end in
+                     ".syntax"; some might not.
+                  *)
+                  if Filename.check_suffix pkg "syntax" ||
+                     List.mem pkg well_known_syntax then
+                    (syn_args @ base_args, syn_args)
+                  else
+                    (base_args, [])
+                in
+                flag ["ocaml"; "compile";  "pkg_"^pkg] & S args;
+                flag ["ocaml"; "ocamldep"; "pkg_"^pkg] & S args;
+                flag ["ocaml"; "doc";      "pkg_"^pkg] & S args;
+                flag ["ocaml"; "link";     "pkg_"^pkg] & S base_args;
+                flag ["ocaml"; "infer_interface"; "pkg_"^pkg] & S args;
+
+                (* TODO: Check if this is allowed for OCaml < 3.12.1 *)
+                flag ["ocaml"; "compile";  "package("^pkg^")"] & S pargs;
+                flag ["ocaml"; "ocamldep"; "package("^pkg^")"] & S pargs;
+                flag ["ocaml"; "doc";      "package("^pkg^")"] & S pargs;
+                flag ["ocaml"; "infer_interface"; "package("^pkg^")"] & S pargs;
+              end
+              (find_packages ());
+          end;
 
           (* Like -package but for extensions syntax. Morover -syntax is useless
            * when linking. *)
@@ -546,12 +557,13 @@ module MyOCamlbuildBase = struct
 
                    (* When ocaml link something that use the C library, then one
                       need that file to be up to date.
+                      This holds both for programs and for libraries.
                     *)
-                   dep ["link"; "ocaml"; "program"; tag_libstubs lib]
-                     [dir/"lib"^(nm_libstubs lib)^"."^(!Options.ext_lib)];
+  		 dep ["link"; "ocaml"; tag_libstubs lib]
+  		     [dir/"lib"^(nm_libstubs lib)^"."^(!Options.ext_lib)];
 
-                   dep  ["compile"; "ocaml"; "program"; tag_libstubs lib]
-                     [dir/"lib"^(nm_libstubs lib)^"."^(!Options.ext_lib)];
+  		 dep  ["compile"; "ocaml"; tag_libstubs lib]
+  		      [dir/"lib"^(nm_libstubs lib)^"."^(!Options.ext_lib)];
 
                    (* TODO: be more specific about what depends on headers *)
                    (* Depends on .h files *)
@@ -580,18 +592,18 @@ module MyOCamlbuildBase = struct
             ()
 
 
-  let dispatch_default t =
+  let dispatch_default conf t =
     dispatch_combine
       [
         dispatch t;
-        MyOCamlbuildFindlib.dispatch;
+        MyOCamlbuildFindlib.dispatch conf;
       ]
 
 
 end
 
 
-# 594 "myocamlbuild.ml"
+# 606 "myocamlbuild.ml"
 open Ocamlbuild_plugin;;
 let package_default =
   {
@@ -647,9 +659,11 @@ let package_default =
   }
   ;;
 
-let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;
+let conf = {MyOCamlbuildFindlib.no_automatic_syntax = false}
+
+let dispatch_default = MyOCamlbuildBase.dispatch_default conf package_default;;
 
-# 653 "myocamlbuild.ml"
+# 667 "myocamlbuild.ml"
 (* OASIS_STOP *)
 
 let () =
@@ -710,6 +724,4 @@ let () =
         flag ["oasis_library_postgresql_cclib"; "link"] opgsql_clibs
       | _ -> ()
   in
-  dispatch (
-    MyOCamlbuildBase.dispatch_combine
-      [MyOCamlbuildBase.dispatch_default package_default; additional_rules])
+  dispatch (MyOCamlbuildBase.dispatch_combine [dispatch_default; additional_rules])