Updated distribution files

Author: mmottl

INSTALL.txt

@@ -1,9 +1,9 @@
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 5cd2d4ec584f25e55d5c8bc833957508) *)
+(* DO NOT EDIT (digest: 851a53835eb2a813e6aeb1a50279e0d5) *)
 This is the INSTALL file for the postgresql-ocaml distribution.
 
 This package uses OASIS to generate its build system. See section OASIS for
-full information. 
+full information.
 
 Dependencies
 ============

_oasis

@@ -1,6 +1,6 @@
 OASISFormat:      0.4
 Name:             postgresql-ocaml
-Version:          2.0.5
+Version:          2.0.6
 Synopsis:         postgresql-ocaml - bindings to the PostgreSQL library
 Description:      postgresql-ocaml offers library functions for accessing PostgreSQL databases
 Authors:          Alain Frisch <[email protected]>,

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 6130d565a6b8b66ced080f5471d86dbf)
+# DO NOT EDIT (digest: 13a07b9ae83498d4d812e34d9fb75898)
 # 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
@@ -23,39 +23,39 @@
 "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_threads
 <lib/*.ml{,i}>: pkg_bigarray
-"lib/postgresql_stubs.c": pkg_threads
+<lib/*.ml{,i}>: pkg_threads
 "lib/postgresql_stubs.c": pkg_bigarray
+"lib/postgresql_stubs.c": pkg_threads
 # Executable cursor
-<examples/cursor.{native,byte}>: use_postgresql
-<examples/cursor.{native,byte}>: pkg_threads
 <examples/cursor.{native,byte}>: pkg_bigarray
+<examples/cursor.{native,byte}>: pkg_threads
+<examples/cursor.{native,byte}>: use_postgresql
 # Executable dump
-<examples/dump.{native,byte}>: use_postgresql
-<examples/dump.{native,byte}>: pkg_threads
 <examples/dump.{native,byte}>: pkg_bigarray
+<examples/dump.{native,byte}>: pkg_threads
+<examples/dump.{native,byte}>: use_postgresql
 # Executable populate
-<examples/populate.{native,byte}>: use_postgresql
-<examples/populate.{native,byte}>: pkg_threads
 <examples/populate.{native,byte}>: pkg_bigarray
+<examples/populate.{native,byte}>: pkg_threads
+<examples/populate.{native,byte}>: use_postgresql
 # Executable prompt
-<examples/prompt.{native,byte}>: use_postgresql
-<examples/prompt.{native,byte}>: pkg_threads
 <examples/prompt.{native,byte}>: pkg_bigarray
+<examples/prompt.{native,byte}>: pkg_threads
+<examples/prompt.{native,byte}>: use_postgresql
 # Executable prompt_gtk
-<examples/prompt_gtk.{native,byte}>: use_postgresql
+<examples/prompt_gtk.{native,byte}>: pkg_bigarray
 <examples/prompt_gtk.{native,byte}>: pkg_lablgtk2
 <examples/prompt_gtk.{native,byte}>: pkg_threads
-<examples/prompt_gtk.{native,byte}>: pkg_bigarray
+<examples/prompt_gtk.{native,byte}>: use_postgresql
 <examples/*.ml{,i}>: pkg_lablgtk2
 # Executable test_lo
-<examples/test_lo.{native,byte}>: use_postgresql
-<examples/test_lo.{native,byte}>: pkg_threads
 <examples/test_lo.{native,byte}>: pkg_bigarray
-<examples/*.ml{,i}>: use_postgresql
-<examples/*.ml{,i}>: pkg_threads
+<examples/test_lo.{native,byte}>: pkg_threads
+<examples/test_lo.{native,byte}>: use_postgresql
 <examples/*.ml{,i}>: pkg_bigarray
+<examples/*.ml{,i}>: pkg_threads
+<examples/*.ml{,i}>: use_postgresql
 # OASIS_STOP
 
 true: -traverse

lib/META

@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: c31bdca2e2a0e283c7e021158379d1c2)
-version = "2.0.5"
+# DO NOT EDIT (digest: b1ebcbe4043a5a4e27c03bddf1379855)
+version = "2.0.6"
 description = "postgresql-ocaml - bindings to the PostgreSQL library"
 requires = "threads bigarray"
 archive(byte) = "postgresql.cma"

lib/postgresql.mldylib

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

myocamlbuild.ml

@@ -1,5 +1,5 @@
 (* OASIS_START *)
-(* DO NOT EDIT (digest: d18e8cffec6dee519b54b3f70fc65adf) *)
+(* DO NOT EDIT (digest: d0d7a31f5fe589f4d2ca00034335e395) *)
 module OASISGettext = struct
 (* # 22 "src/oasis/OASISGettext.ml" *)
 
@@ -204,26 +204,27 @@ module BaseEnvLight = struct
       end
 
 
-  let var_get name env =
-    let rec var_expand str =
-      let buff =
-        Buffer.create ((String.length str) * 2)
-      in
-        Buffer.add_substitute
-          buff
-          (fun var ->
-             try
-               var_expand (MapString.find var env)
-             with Not_found ->
-               failwith
-                 (Printf.sprintf
-                    "No variable %s defined when trying to expand %S."
-                    var
-                    str))
-          str;
-        Buffer.contents buff
+  let rec var_expand str env =
+    let buff =
+      Buffer.create ((String.length str) * 2)
     in
-      var_expand (MapString.find name env)
+      Buffer.add_substitute
+        buff
+        (fun var ->
+           try
+             var_expand (MapString.find var env) env
+           with Not_found ->
+             failwith
+               (Printf.sprintf
+                  "No variable %s defined when trying to expand %S."
+                  var
+                  str))
+        str;
+      Buffer.contents buff
+
+
+  let var_get name env =
+    var_expand (MapString.find name env) env
 
 
   let var_choose lst env =
@@ -233,7 +234,7 @@ module BaseEnvLight = struct
 end
 
 
-# 236 "myocamlbuild.ml"
+# 237 "myocamlbuild.ml"
 module MyOCamlbuildFindlib = struct
 (* # 22 "src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
 
@@ -306,6 +307,22 @@ module MyOCamlbuildFindlib = struct
   let find_syntaxes () = ["camlp4o"; "camlp4r"]
 
 
+  let well_known_syntax = [
+    "camlp4.quotations.o";
+    "camlp4.quotations.r";
+    "camlp4.exceptiontracer";
+    "camlp4.extend";
+    "camlp4.foldgenerator";
+    "camlp4.listcomprehension";
+    "camlp4.locationstripper";
+    "camlp4.macro";
+    "camlp4.mapgenerator";
+    "camlp4.metagenerator";
+    "camlp4.profiler";
+    "camlp4.tracer"
+  ]
+
+
   let dispatch =
     function
       | Before_options ->
@@ -331,13 +348,17 @@ module MyOCamlbuildFindlib = struct
           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"
-                then syn_args @ base_args
-                else base_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;
@@ -368,7 +389,11 @@ module MyOCamlbuildFindlib = struct
           flag ["ocaml"; "pkg_threads"; "compile"] (S[A "-thread"]);
           flag ["ocaml"; "pkg_threads"; "doc"] (S[A "-I"; A "+threads"]);
           flag ["ocaml"; "pkg_threads"; "link"] (S[A "-thread"]);
-          flag ["ocaml"; "pkg_threads"; "infer_interface"] (S[A "-thread"])
+          flag ["ocaml"; "pkg_threads"; "infer_interface"] (S[A "-thread"]);
+          flag ["ocaml"; "package(threads)"; "compile"] (S[A "-thread"]);
+          flag ["ocaml"; "package(threads)"; "doc"] (S[A "-I"; A "+threads"]);
+          flag ["ocaml"; "package(threads)"; "link"] (S[A "-thread"]);
+          flag ["ocaml"; "package(threads)"; "infer_interface"] (S[A "-thread"]);
 
       | _ ->
           ()
@@ -527,10 +552,14 @@ module MyOCamlbuildBase = struct
               (* Add flags *)
               List.iter
               (fun (tags, cond_specs) ->
-                 let spec =
-                   BaseEnvLight.var_choose cond_specs env
+                 let spec = BaseEnvLight.var_choose cond_specs env in
+                 let rec eval_specs =
+                   function
+                     | S lst -> S (List.map eval_specs lst)
+                     | A str -> A (BaseEnvLight.var_expand str env)
+                     | spec -> spec
                  in
-                   flag tags & spec)
+                   flag tags & (eval_specs spec))
               t.flags
         | _ ->
             ()
@@ -547,7 +576,7 @@ module MyOCamlbuildBase = struct
 end
 
 
-# 550 "myocamlbuild.ml"
+# 579 "myocamlbuild.ml"
 open Ocamlbuild_plugin;;
 let package_default =
   {
@@ -605,7 +634,7 @@ let package_default =
 
 let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;
 
-# 609 "myocamlbuild.ml"
+# 638 "myocamlbuild.ml"
 (* OASIS_STOP *)
 
 let () =