[Pkg-ocaml-maint-commits] [ocaml-sqlite3] 03/19: Imported Upstream version 2.0.8
Stéphane Glondu
glondu at moszumanska.debian.org
Wed Aug 3 13:55:23 UTC 2016
This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository ocaml-sqlite3.
commit 587859162e4fef447d5d3395cf6aa162df7fae93
Author: Stephane Glondu <steph at glondu.net>
Date: Wed Aug 3 15:37:15 2016 +0200
Imported Upstream version 2.0.8
---
AUTHORS.txt | 6 +-
CHANGES.txt | 4 ++
INSTALL.txt | 4 +-
_oasis | 6 +-
_tags | 11 ++--
lib/META | 4 +-
myocamlbuild.ml | 94 +++++++++++++++------------
setup.ml | 193 +++++++++++++++++++++++++++++++++-----------------------
8 files changed, 188 insertions(+), 134 deletions(-)
diff --git a/AUTHORS.txt b/AUTHORS.txt
index 485ef9e..8511a24 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -1,12 +1,12 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: 9c87a06631b868754f08c4717a3cc39e) *)
+(* DO NOT EDIT (digest: 3a7868d1a885cff6a9032db74490004b) *)
-Authors of sqlite3-ocaml:
+Authors of sqlite3:
* Markus Mottl <markus.mottl at gmail.com>
* Christian Szegedy <csdontspam at metamatix.com>
-Current maintainers of sqlite3-ocaml:
+Current maintainers of sqlite3:
* Markus Mottl <markus.mottl at gmail.com>
* Christian Szegedy <csdontspam at metamatix.com>
diff --git a/CHANGES.txt b/CHANGES.txt
index b7d415b..630ebb2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+2015-01-29: Fixed a build problem due to Oasis/ocamlbuild inconsistency.
+
+ Thanks to Leonid Rozenberg <leonidr at gmail.com> for this patch!
+
2014-10-08: Fixed a callback locking bug when encountering rows containing
unexpected NULLs.
diff --git a/INSTALL.txt b/INSTALL.txt
index 90ff2ba..7f0aa6e 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,7 +1,7 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: 9d8899a6f6c4cdc71a7a30bd6ed44bdb) *)
+(* DO NOT EDIT (digest: dd3cb7c4515a29aaa64bbcda8b16a781) *)
-This is the INSTALL file for the sqlite3-ocaml distribution.
+This is the INSTALL file for the sqlite3 distribution.
This package uses OASIS to generate its build system. See section OASIS for
full information.
diff --git a/_oasis b/_oasis
index 3314c3a..449620b 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.4
-Name: sqlite3-ocaml
-Version: 2.0.7
+Name: sqlite3
+Version: 2.0.8
Synopsis: sqlite3-ocaml - SQLite3 bindings
Description: sqlite3-ocaml is an OCaml library with bindings to the
SQLite3 client API. Sqlite3 is a self-contained, serverless,
@@ -12,7 +12,7 @@ Description: sqlite3-ocaml is an OCaml library with bindings to the
Authors: Markus Mottl <markus.mottl at gmail.com>,
Christian Szegedy <csdontspam at metamatix.com>
Copyrights: (C) 2007-2010 Jane Street Holding LLC <opensource at janestreet.com>,
- (C) 2010-2012 Markus Mottl <markus.mottl at gmail.com>,
+ (C) 2010-2015 Markus Mottl <markus.mottl at gmail.com>,
(C) 2005-2012 Christian Szegedy <csdontspam at metamatix.com>
Maintainers: Markus Mottl <markus.mottl at gmail.com>,
Christian Szegedy <csdontspam at metamatix.com>
diff --git a/_tags b/_tags
index 8a7e751..54423cd 100644
--- a/_tags
+++ b/_tags
@@ -1,8 +1,9 @@
# OASIS_START
-# DO NOT EDIT (digest: 4229fa2a44dd62be7c4c4e5e8015a6d2)
+# DO NOT EDIT (digest: 3fd9cff80b9dcdb8cdf52535e63056b7)
# 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,7 +16,7 @@
"_darcs": not_hygienic
# Library sqlite3
"lib/sqlite3.cmxs": use_sqlite3
-<lib/*.ml{,i}>: oasis_library_sqlite3_ccopt
+<lib/*.ml{,i,y}>: oasis_library_sqlite3_ccopt
"lib/sqlite3_stubs.c": oasis_library_sqlite3_ccopt
<lib/sqlite3.{cma,cmxa}>: oasis_library_sqlite3_cclib
"lib/libsqlite3_stubs.lib": oasis_library_sqlite3_cclib
@@ -32,14 +33,14 @@
# Executable test_fun
<test/test_fun.{native,byte}>: pkg_str
<test/test_fun.{native,byte}>: use_sqlite3
-<test/*.ml{,i}>: pkg_str
+<test/*.ml{,i,y}>: pkg_str
# Executable test_stmt
<test/test_stmt.{native,byte}>: use_sqlite3
-<test/*.ml{,i}>: use_sqlite3
+<test/*.ml{,i,y}>: use_sqlite3
# OASIS_STOP
true: -traverse
<{lib,test}/**>: traverse
-<**/*.ml{,i}>: warn(Aer-44), strict_sequence, annot
+<**/*.ml{,i}>: warn(Aer-44), strict_sequence, safe_string, annot
"lib/sqlite3.cmxs": use_libsqlite3_stubs
diff --git a/lib/META b/lib/META
index 22f40cd..eb915a1 100644
--- a/lib/META
+++ b/lib/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: 1b69b1c599bc2c8a7c558406b2269d24)
-version = "2.0.7"
+# DO NOT EDIT (digest: 8305eccf9d25fc8cbe922719f09082c2)
+version = "2.0.8"
description = "sqlite3-ocaml - SQLite3 bindings"
archive(byte) = "sqlite3.cma"
archive(byte, plugin) = "sqlite3.cma"
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index 7b0b613..52659da 100644
--- a/myocamlbuild.ml
+++ b/myocamlbuild.ml
@@ -1,5 +1,5 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: 8f064c0cdeaac0998df7ee6ee3a7aa06) *)
+(* DO NOT EDIT (digest: 8856c7fbdf56cf3b352c8f24a59be7a0) *)
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 read_lines_from_cmd ~max_lines cmd =
@@ -718,13 +732,13 @@ let () =
let osqlite3_cflags =
let cmd = "pkg-config --cflags sqlite3" in
match read_lines_from_cmd ~max_lines:1 cmd with
- | [cflags] -> S (ocamlify ~ocaml_flag:"-ccopt" cflags)
+ | [cflags] when cflags <> "" -> S (ocamlify ~ocaml_flag:"-ccopt" cflags)
| _ -> failwith "pkg-config failed for cflags"
in
let sqlite3_clibs, osqlite3_clibs =
let cmd = "pkg-config --libs sqlite3" in
match read_lines_from_cmd ~max_lines:1 cmd with
- | [libs] ->
+ | [libs] when libs <> "" ->
S (split_flags libs), S (ocamlify ~ocaml_flag:"-cclib" libs)
| _ -> failwith "pkg-config failed for libs"
in
@@ -736,4 +750,4 @@ let () =
in
dispatch (
MyOCamlbuildBase.dispatch_combine
- [MyOCamlbuildBase.dispatch_default package_default; additional_rules])
+ [MyOCamlbuildBase.dispatch_default conf package_default; additional_rules])
diff --git a/setup.ml b/setup.ml
index 88f0699..7406502 100644
--- a/setup.ml
+++ b/setup.ml
@@ -1,9 +1,9 @@
(* setup.ml generated for the first time by OASIS v0.3.0 *)
(* OASIS_START *)
-(* DO NOT EDIT (digest: 5e70b386b060766d51d5020cdd41d791) *)
+(* DO NOT EDIT (digest: d72ad52c970b501a8decfd221dc8edff) *)
(*
- Regenerated by OASIS v0.4.4
+ Regenerated by OASIS v0.4.5
Visit http://oasis.forge.ocamlcore.org for more information and
documentation about functions used in this file.
*)
@@ -242,11 +242,9 @@ module OASISString = struct
let replace_chars f s =
- let buf = String.make (String.length s) 'X' in
- for i = 0 to String.length s - 1 do
- buf.[i] <- f s.[i]
- done;
- buf
+ let buf = Buffer.create (String.length s) in
+ String.iter (fun c -> Buffer.add_char buf (f c)) s;
+ Buffer.contents buf
end
@@ -1729,6 +1727,13 @@ module OASISFeatures = struct
(fun () ->
s_ "Allows the OASIS section comments and digest to be omitted in \
generated files.")
+
+ let no_automatic_syntax =
+ create "no_automatic_syntax" alpha
+ (fun () ->
+ s_ "Disable the automatic inclusion of -syntax camlp4o for packages \
+ that matches the internal heuristic (if a dependency ends with \
+ a .syntax or is a well known syntax).")
end
module OASISUnixPath = struct
@@ -2099,16 +2104,6 @@ module OASISLibrary = struct
lst
in
- (* The headers that should be compiled along *)
- let headers =
- if lib.lib_pack then
- []
- else
- find_modules
- lib.lib_modules
- "cmi"
- in
-
(* The .cmx that be compiled along *)
let cmxs =
let should_be_built =
@@ -2134,12 +2129,32 @@ module OASISLibrary = struct
[]
in
+ (* The headers and annot/cmt files that should be compiled along *)
+ let headers =
+ let sufx =
+ if lib.lib_pack
+ then [".cmti"; ".cmt"; ".annot"]
+ else [".cmi"; ".cmti"; ".cmt"; ".annot"]
+ in
+ List.map
+ begin
+ List.fold_left
+ begin fun accu s ->
+ let dot = String.rindex s '.' in
+ let base = String.sub s 0 dot in
+ List.map ((^) base) sufx @ accu
+ end
+ []
+ end
+ (find_modules lib.lib_modules "cmi")
+ in
+
(* Compute what libraries should be built *)
let acc_nopath =
(* Add the packed header file if required *)
let add_pack_header acc =
if lib.lib_pack then
- [cs.cs_name^".cmi"] :: acc
+ [cs.cs_name^".cmi"; cs.cs_name^".cmti"; cs.cs_name^".cmt"] :: acc
else
acc
in
@@ -2499,13 +2514,13 @@ module OASISFindlib = struct
in
let library_name_of_findlib_name =
- Lazy.lazy_from_fun
- (fun () ->
- (* Revert findlib_name_of_library_name. *)
- MapString.fold
- (fun k v mp -> MapString.add v k mp)
- fndlb_name_of_lib_name
- MapString.empty)
+ lazy begin
+ (* Revert findlib_name_of_library_name. *)
+ MapString.fold
+ (fun k v mp -> MapString.add v k mp)
+ fndlb_name_of_lib_name
+ MapString.empty
+ end
in
let library_name_of_findlib_name fndlb_nm =
try
@@ -2875,7 +2890,7 @@ module OASISFileUtil = struct
end
-# 2878 "setup.ml"
+# 2893 "setup.ml"
module BaseEnvLight = struct
(* # 22 "src/base/BaseEnvLight.ml" *)
@@ -2980,7 +2995,7 @@ module BaseEnvLight = struct
end
-# 2983 "setup.ml"
+# 2998 "setup.ml"
module BaseContext = struct
(* # 22 "src/base/BaseContext.ml" *)
@@ -5391,7 +5406,7 @@ module BaseSetup = struct
end
-# 5394 "setup.ml"
+# 5409 "setup.ml"
module InternalConfigurePlugin = struct
(* # 22 "src/plugins/internal/InternalConfigurePlugin.ml" *)
@@ -5827,6 +5842,17 @@ module InternalInstallPlugin = struct
lst
in
+ let make_fnames modul sufx =
+ List.fold_right
+ begin fun sufx accu ->
+ (String.capitalize modul ^ sufx) ::
+ (String.uncapitalize modul ^ sufx) ::
+ accu
+ end
+ sufx
+ []
+ in
+
(** Install all libraries *)
let install_libs pkg =
@@ -5847,27 +5873,29 @@ module InternalInstallPlugin = struct
OASISHostPath.of_unix bs.bs_path
in
List.fold_left
- (fun acc modul ->
- try
- List.find
- OASISFileUtil.file_exists_case
- (List.map
- (Filename.concat path)
- [modul^".mli";
- modul^".ml";
- String.uncapitalize modul^".mli";
- String.capitalize modul^".mli";
- String.uncapitalize modul^".ml";
- String.capitalize modul^".ml"])
- :: acc
- with Not_found ->
- begin
- warning
- (f_ "Cannot find source header for module %s \
- in library %s")
- modul cs.cs_name;
- acc
- end)
+ begin fun acc modul ->
+ begin
+ try
+ [List.find
+ OASISFileUtil.file_exists_case
+ (List.map
+ (Filename.concat path)
+ (make_fnames modul [".mli"; ".ml"]))]
+ with Not_found ->
+ warning
+ (f_ "Cannot find source header for module %s \
+ in library %s")
+ modul cs.cs_name;
+ []
+ end
+ @
+ List.filter
+ OASISFileUtil.file_exists_case
+ (List.map
+ (Filename.concat path)
+ (make_fnames modul [".annot";".cmti";".cmt"]))
+ @ acc
+ end
acc
lib.lib_modules
in
@@ -5915,27 +5943,29 @@ module InternalInstallPlugin = struct
OASISHostPath.of_unix bs.bs_path
in
List.fold_left
- (fun acc modul ->
- try
- List.find
- OASISFileUtil.file_exists_case
- (List.map
- (Filename.concat path)
- [modul^".mli";
- modul^".ml";
- String.uncapitalize modul^".mli";
- String.capitalize modul^".mli";
- String.uncapitalize modul^".ml";
- String.capitalize modul^".ml"])
- :: acc
- with Not_found ->
- begin
- warning
- (f_ "Cannot find source header for module %s \
- in object %s")
- modul cs.cs_name;
- acc
- end)
+ begin fun acc modul ->
+ begin
+ try
+ [List.find
+ OASISFileUtil.file_exists_case
+ (List.map
+ (Filename.concat path)
+ (make_fnames modul [".mli"; ".ml"]))]
+ with Not_found ->
+ warning
+ (f_ "Cannot find source header for module %s \
+ in object %s")
+ modul cs.cs_name;
+ []
+ end
+ @
+ List.filter
+ OASISFileUtil.file_exists_case
+ (List.map
+ (Filename.concat path)
+ (make_fnames modul [".annot";".cmti";".cmt"]))
+ @ acc
+ end
acc
obj.obj_modules
in
@@ -6240,7 +6270,7 @@ module InternalInstallPlugin = struct
end
-# 6243 "setup.ml"
+# 6273 "setup.ml"
module OCamlbuildCommon = struct
(* # 22 "src/plugins/ocamlbuild/OCamlbuildCommon.ml" *)
@@ -6298,6 +6328,11 @@ module OCamlbuildCommon = struct
else
[];
+ if bool_of_string (tests ()) then
+ ["-tag"; "tests"]
+ else
+ [];
+
if bool_of_string (profile ()) then
["-tag"; "profile"]
else
@@ -6613,7 +6648,7 @@ module OCamlbuildDocPlugin = struct
end
-# 6616 "setup.ml"
+# 6651 "setup.ml"
module CustomPlugin = struct
(* # 22 "src/plugins/custom/CustomPlugin.ml" *)
@@ -6761,7 +6796,7 @@ module CustomPlugin = struct
end
-# 6764 "setup.ml"
+# 6799 "setup.ml"
open OASISTypes;;
let setup_t =
@@ -6921,8 +6956,8 @@ let setup_t =
findlib_version = Some (OASISVersion.VGreaterEqual "1.3.1");
alpha_features = [];
beta_features = [];
- name = "sqlite3-ocaml";
- version = "2.0.7";
+ name = "sqlite3";
+ version = "2.0.8";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
@@ -6935,7 +6970,7 @@ let setup_t =
copyrights =
[
"(C) 2007-2010 Jane Street Holding LLC <opensource at janestreet.com>";
- "(C) 2010-2012 Markus Mottl <markus.mottl at gmail.com>";
+ "(C) 2010-2015 Markus Mottl <markus.mottl at gmail.com>";
"(C) 2005-2012 Christian Szegedy <csdontspam at metamatix.com>"
];
maintainers =
@@ -7394,8 +7429,8 @@ let setup_t =
plugin_data = []
};
oasis_fn = Some "_oasis";
- oasis_version = "0.4.4";
- oasis_digest = Some "K)\127n������\011=�\024�\020";
+ oasis_version = "0.4.5";
+ oasis_digest = Some "�X\012$oƺ;�ٯ�A�y";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
@@ -7403,6 +7438,6 @@ let setup_t =
let setup () = BaseSetup.setup setup_t;;
-# 7407 "setup.ml"
+# 7442 "setup.ml"
(* OASIS_STOP *)
let () = setup ();;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlite3.git
More information about the Pkg-ocaml-maint-commits
mailing list