Skip to content

Commit 100f3eb

Browse files
committed
Updated distribution files
1 parent f5a3727 commit 100f3eb

File tree

5 files changed

+36
-50
lines changed

5 files changed

+36
-50
lines changed

CHANGES.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2017-06-11: Fixed return value bug in enable_load_extension. The result
2+
was just the opposite of what the API documentation says.
3+
14
2017-01-04: Added external dependency to OPAM spec for openSUSE support.
25

36
2017-01-03: Fixed incorrect LGPL license reference in Oasis specification.

_oasis

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
OASISFormat: 0.4
22
Name: sqlite3
3-
Version: 4.1.2
3+
Version: 4.1.3
44
Synopsis: sqlite3-ocaml - SQLite3 bindings
55
Description: sqlite3-ocaml is an OCaml library with bindings to the
66
SQLite3 client API. Sqlite3 is a self-contained, serverless,

myocamlbuild.ml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(* OASIS_START *)
2-
(* DO NOT EDIT (digest: 5ad2202fdae1797c21756995bc2c9791) *)
2+
(* DO NOT EDIT (digest: 3d48e671786fb3d7be1b361d7689c1a7) *)
33
module OASISGettext = struct
44
(* # 22 "src/oasis/OASISGettext.ml" *)
55

@@ -105,10 +105,7 @@ module OASISString = struct
105105
ok := false;
106106
incr str_idx
107107
done;
108-
if !what_idx = String.length what then
109-
true
110-
else
111-
false
108+
!what_idx = String.length what
112109

113110

114111
let strip_starts_with ~what str =
@@ -131,10 +128,7 @@ module OASISString = struct
131128
ok := false;
132129
decr str_idx
133130
done;
134-
if !what_idx = -1 then
135-
true
136-
else
137-
false
131+
!what_idx = -1
138132

139133

140134
let strip_ends_with ~what str =
@@ -440,7 +434,7 @@ module OASISExpr = struct
440434
end
441435

442436

443-
# 443 "myocamlbuild.ml"
437+
# 437 "myocamlbuild.ml"
444438
module BaseEnvLight = struct
445439
(* # 22 "src/base/BaseEnvLight.ml" *)
446440

@@ -520,7 +514,7 @@ module BaseEnvLight = struct
520514
end
521515

522516

523-
# 523 "myocamlbuild.ml"
517+
# 517 "myocamlbuild.ml"
524518
module MyOCamlbuildFindlib = struct
525519
(* # 22 "src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
526520

@@ -881,7 +875,7 @@ module MyOCamlbuildBase = struct
881875
end
882876

883877

884-
# 884 "myocamlbuild.ml"
878+
# 878 "myocamlbuild.ml"
885879
open Ocamlbuild_plugin;;
886880
let package_default =
887881
{
@@ -990,7 +984,7 @@ let conf = {MyOCamlbuildFindlib.no_automatic_syntax = false}
990984

991985
let dispatch_default = MyOCamlbuildBase.dispatch_default conf package_default;;
992986

993-
# 994 "myocamlbuild.ml"
987+
# 988 "myocamlbuild.ml"
994988
(* OASIS_STOP *)
995989

996990
let read_lines_from_cmd ~max_lines cmd =

opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
opam-version: "1.2"
22
name: "sqlite3"
3-
version: "4.1.2"
3+
version: "4.1.3"
44
maintainer: "Markus Mottl <[email protected]>"
55
authors: [ "Markus Mottl <[email protected]>"
66
"Christian Szegedy <[email protected]>" ]

setup.ml

Lines changed: 24 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
(* setup.ml generated for the first time by OASIS v0.3.0 *)
22

33
(* OASIS_START *)
4-
(* DO NOT EDIT (digest: 7960a9c9ee49471a7f4e7abcee9794e7) *)
4+
(* DO NOT EDIT (digest: c8988c7c1cbf948ad1030173f3247cdc) *)
55
(*
6-
Regenerated by OASIS v0.4.8
6+
Regenerated by OASIS v0.4.10
77
Visit http://oasis.forge.ocamlcore.org for more information and
88
documentation about functions used in this file.
99
*)
@@ -112,10 +112,7 @@ module OASISString = struct
112112
ok := false;
113113
incr str_idx
114114
done;
115-
if !what_idx = String.length what then
116-
true
117-
else
118-
false
115+
!what_idx = String.length what
119116

120117

121118
let strip_starts_with ~what str =
@@ -138,10 +135,7 @@ module OASISString = struct
138135
ok := false;
139136
decr str_idx
140137
done;
141-
if !what_idx = -1 then
142-
true
143-
else
144-
false
138+
!what_idx = -1
145139

146140

147141
let strip_ends_with ~what str =
@@ -3162,7 +3156,7 @@ module OASISFileUtil = struct
31623156
end
31633157

31643158

3165-
# 3165 "setup.ml"
3159+
# 3159 "setup.ml"
31663160
module BaseEnvLight = struct
31673161
(* # 22 "src/base/BaseEnvLight.ml" *)
31683162

@@ -3242,7 +3236,7 @@ module BaseEnvLight = struct
32423236
end
32433237

32443238

3245-
# 3245 "setup.ml"
3239+
# 3239 "setup.ml"
32463240
module BaseContext = struct
32473241
(* # 22 "src/base/BaseContext.ml" *)
32483242

@@ -5665,7 +5659,7 @@ module BaseCompat = struct
56655659
end
56665660

56675661

5668-
# 5668 "setup.ml"
5662+
# 5662 "setup.ml"
56695663
module InternalConfigurePlugin = struct
56705664
(* # 22 "src/plugins/internal/InternalConfigurePlugin.ml" *)
56715665

@@ -6016,17 +6010,14 @@ module InternalInstallPlugin = struct
60166010

60176011
let install =
60186012

6019-
let in_destdir =
6013+
let in_destdir fn =
60206014
try
6021-
let destdir =
6022-
destdir ()
6023-
in
6024-
(* Practically speaking destdir is prepended
6025-
* at the beginning of the target filename
6026-
*)
6027-
fun fn -> destdir^fn
6015+
(* Practically speaking destdir is prepended at the beginning of the
6016+
target filename
6017+
*)
6018+
(destdir ())^fn
60286019
with PropList.Not_set _ ->
6029-
fun fn -> fn
6020+
fn
60306021
in
60316022

60326023
let install_file ~ctxt ?(prepend_destdir=true) ?tgt_fn src_file envdir =
@@ -6471,7 +6462,7 @@ module InternalInstallPlugin = struct
64716462
end
64726463

64736464

6474-
# 6474 "setup.ml"
6465+
# 6465 "setup.ml"
64756466
module OCamlbuildCommon = struct
64766467
(* # 22 "src/plugins/ocamlbuild/OCamlbuildCommon.ml" *)
64776468

@@ -6828,11 +6819,10 @@ module OCamlbuildDocPlugin = struct
68286819
run_ocamlbuild ~ctxt (index_html :: run.extra_args) argv;
68296820
List.iter
68306821
(fun glb ->
6831-
BaseBuilt.register
6832-
~ctxt
6833-
BaseBuilt.BDoc
6834-
cs.cs_name
6835-
[OASISFileUtil.glob ~ctxt (Filename.concat tgt_dir glb)])
6822+
match OASISFileUtil.glob ~ctxt (Filename.concat tgt_dir glb) with
6823+
| (_ :: _) as filenames ->
6824+
BaseBuilt.register ~ctxt BaseBuilt.BDoc cs.cs_name [filenames]
6825+
| [] -> ())
68366826
["*.html"; "*.css"]
68376827

68386828

@@ -6844,7 +6834,7 @@ module OCamlbuildDocPlugin = struct
68446834
end
68456835

68466836

6847-
# 6847 "setup.ml"
6837+
# 6837 "setup.ml"
68486838
module CustomPlugin = struct
68496839
(* # 22 "src/plugins/custom/CustomPlugin.ml" *)
68506840

@@ -6976,7 +6966,7 @@ module CustomPlugin = struct
69766966
end
69776967

69786968

6979-
# 6979 "setup.ml"
6969+
# 6969 "setup.ml"
69806970
open OASISTypes;;
69816971

69826972
let setup_t =
@@ -7157,7 +7147,7 @@ let setup_t =
71577147
{
71587148
oasis_version = "0.4";
71597149
ocaml_version = Some (OASISVersion.VGreaterEqual "3.12");
7160-
version = "4.1.2";
7150+
version = "4.1.3";
71617151
license =
71627152
OASISLicense.DEP5License
71637153
(OASISLicense.DEP5Unit
@@ -8527,17 +8517,16 @@ let setup_t =
85278517
plugin_data = []
85288518
};
85298519
oasis_fn = Some "_oasis";
8530-
oasis_version = "0.4.8";
8531-
oasis_digest =
8532-
Some "\197i\019\018\207=r\147w\133\145\165\137\162\148\138";
8520+
oasis_version = "0.4.10";
8521+
oasis_digest = Some "ZT\242[9Gs&\208\160n1\169=T\001";
85338522
oasis_exec = None;
85348523
oasis_setup_args = [];
85358524
setup_update = false
85368525
};;
85378526

85388527
let setup () = BaseSetup.setup setup_t;;
85398528

8540-
# 8541 "setup.ml"
8529+
# 8530 "setup.ml"
85418530
let setup_t = BaseCompat.Compat_0_4.adapt_setup_t setup_t
85428531
open BaseCompat.Compat_0_4
85438532
(* OASIS_STOP *)

0 commit comments

Comments
 (0)