This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocaml-sqlite3.
commit 0088c1e9d678ce7615155e1f39cf88846eb20c16 Author: Stephane Glondu <st...@glondu.net> Date: Wed Aug 3 15:37:21 2016 +0200 Imported Upstream version 4.0.2 --- CHANGES.txt | 4 ++++ README.md | 4 +++- _oasis | 2 +- lib/META | 4 ++-- myocamlbuild.ml | 6 +++++- setup.ml | 6 +++--- test/test_error.ml | 12 ++++++++---- 7 files changed, 26 insertions(+), 12 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 22bd07f..4fb5b79 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,7 @@ +2015-11-18: More build process improvements for Homebrew users. + + Thanks to Leonid Rozenberg <leon...@gmail.com> for this patch! + 2015-11-05: Improved build process for Homebrew users. Thanks to Leonid Rozenberg <leon...@gmail.com> for this patch! diff --git a/README.md b/README.md index a5ef00f..af2ed1a 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,9 @@ Undefined symbols for architecture ...: * If you need to change where `pkg-config` will look for the SQLite3 library, set the `PKG_CONFIG_PATH` environment variable to the new - directory. + directory. This can be automated by setting the `SQLITE3_OCAML_BREWCHECK` + environment variable; this will instruct the build to see if a _brewed_ + version of SQLite is installed and route `pkg-config` appropriately. Credits ------- diff --git a/_oasis b/_oasis index 8c979df..afb39a8 100644 --- a/_oasis +++ b/_oasis @@ -1,6 +1,6 @@ OASISFormat: 0.4 Name: sqlite3 -Version: 4.0.1 +Version: 4.0.2 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, diff --git a/lib/META b/lib/META index 8f3ef17..094762b 100644 --- a/lib/META +++ b/lib/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: fa19b11d9ac1a4791fb1c01cd07a002f) -version = "4.0.1" +# DO NOT EDIT (digest: 5524efdf2a9ea85569fd9184ad5804ae) +version = "4.0.2" description = "sqlite3-ocaml - SQLite3 bindings" archive(byte) = "sqlite3.cma" archive(byte, plugin) = "sqlite3.cma" diff --git a/myocamlbuild.ml b/myocamlbuild.ml index 4cff5b3..bb41a99 100644 --- a/myocamlbuild.ml +++ b/myocamlbuild.ml @@ -712,7 +712,11 @@ let pkg_export = let env = BaseEnvLight.load () in let bcs = BaseEnvLight.var_get "brewcheck" env in let bcs = try bool_of_string bcs with _ -> false in - if not bcs then "" + let proc_env = + try ignore (Sys.getenv "SQLITE3_OCAML_BREWCHECK"); true + with _ -> false + in + if not (bcs || proc_env) then "" else let cmd = "brew ls sqlite | grep pkgconfig" in match read_lines_from_cmd ~max_lines:1 cmd with diff --git a/setup.ml b/setup.ml index 0975922..cbe1390 100644 --- a/setup.ml +++ b/setup.ml @@ -1,7 +1,7 @@ (* setup.ml generated for the first time by OASIS v0.3.0 *) (* OASIS_START *) -(* DO NOT EDIT (digest: 728d524ab62c228fdd760d9587408492) *) +(* DO NOT EDIT (digest: 4f2751487ce181081e99de1028e4c41a) *) (* Regenerated by OASIS v0.4.5 Visit http://oasis.forge.ocamlcore.org for more information and @@ -6981,7 +6981,7 @@ let setup_t = alpha_features = []; beta_features = []; name = "sqlite3"; - version = "4.0.1"; + version = "4.0.2"; license = OASISLicense.DEP5License (OASISLicense.DEP5Unit @@ -7523,7 +7523,7 @@ let setup_t = }; oasis_fn = Some "_oasis"; oasis_version = "0.4.5"; - oasis_digest = Some "\\\015�\014�Mkl=�\026\129\146zR\144"; + oasis_digest = Some "\t��%�~;��\t=��\\¶"; oasis_exec = None; oasis_setup_args = []; setup_update = false diff --git a/test/test_error.ml b/test/test_error.ml index 048e8e6..864be3e 100644 --- a/test/test_error.ml +++ b/test/test_error.ml @@ -1,8 +1,12 @@ open Sqlite3 -(* Tests our ability to return an error from a user defined function *) +exception This_function_always_fails + +(* Tests our ability to raise an exception from a user-defined function *) let () = let db = db_open "t" in - create_fun0 db "MYERROR" (fun () -> failwith "This function always errors"); - let res = exec db "SELECT MYERROR();" in - prerr_endline ("Should have thrown an error: " ^ Rc.to_string res) + create_fun0 db "MYERROR" (fun () -> raise This_function_always_fails); + try + let res = exec db "SELECT MYERROR();" in + prerr_endline ("Should have thrown an error: " ^ Rc.to_string res) + with This_function_always_fails -> print_endline "Ok" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlite3.git _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits