Skip to content

Commit 4c6ed76

Browse files
committed
Fixed incorrect license reference in Oasis specification
1 parent d118c98 commit 4c6ed76

File tree

5 files changed

+31
-22
lines changed

5 files changed

+31
-22
lines changed

CHANGES.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2017-01-03: Fixed incorrect LGPL license reference in Oasis specification.
2+
The software is actually distributed under the Expat-license.
3+
14
2016-12-15: Added new functions for more efficient and convenient blob access:
25

36
* column_blob

_oasis

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
OASISFormat: 0.4
22
Name: sqlite3
3-
Version: 4.1.0
3+
Version: 4.1.1
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,
@@ -17,7 +17,7 @@ Copyrights: (C) 2007-2010 Jane Street Holding LLC <[email protected]
1717
Maintainers: Markus Mottl <[email protected]>,
1818
Christian Szegedy <[email protected]>
1919
LicenseFile: COPYING.txt
20-
License: LGPL-2.1+ with OCaml linking exception
20+
License: Expat
2121
OCamlVersion: >= 3.12
2222
FindlibVersion: >= 1.3.1
2323
Homepage: http://mmottl.github.io/sqlite3-ocaml

myocamlbuild.ml

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

@@ -746,6 +746,9 @@ module MyOCamlbuildBase = struct
746746
(* # 110 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
747747

748748

749+
let env_filename = Pathname.basename BaseEnvLight.default_filename
750+
751+
749752
let dispatch_combine lst =
750753
fun e ->
751754
List.iter
@@ -878,7 +881,7 @@ module MyOCamlbuildBase = struct
878881
end
879882

880883

881-
# 881 "myocamlbuild.ml"
884+
# 884 "myocamlbuild.ml"
882885
open Ocamlbuild_plugin;;
883886
let package_default =
884887
{
@@ -987,7 +990,7 @@ let conf = {MyOCamlbuildFindlib.no_automatic_syntax = false}
987990

988991
let dispatch_default = MyOCamlbuildBase.dispatch_default conf package_default;;
989992

990-
# 991 "myocamlbuild.ml"
993+
# 994 "myocamlbuild.ml"
991994
(* OASIS_STOP *)
992995

993996
let read_lines_from_cmd ~max_lines cmd =

setup.ml

Lines changed: 18 additions & 15 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: 4d1117fdef16d5bfd3ab11d080ff8644) *)
4+
(* DO NOT EDIT (digest: ca0a65af2ec3c9934900a490b3a6e221) *)
55
(*
6-
Regenerated by OASIS v0.4.7
6+
Regenerated by OASIS v0.4.8
77
Visit http://oasis.forge.ocamlcore.org for more information and
88
documentation about functions used in this file.
99
*)
@@ -658,6 +658,7 @@ module OASISContext = struct
658658
ignore_unknown_fields: bool;
659659
printf: level -> string -> unit;
660660
srcfs: source OASISFileSystem.fs;
661+
load_oasis_plugin: string -> bool;
661662
}
662663

663664

@@ -682,6 +683,7 @@ module OASISContext = struct
682683
ignore_unknown_fields = false;
683684
printf = printf;
684685
srcfs = new OASISFileSystem.host_fs(Sys.getcwd ());
686+
load_oasis_plugin = (fun _ -> false);
685687
}
686688

687689

@@ -3160,7 +3162,7 @@ module OASISFileUtil = struct
31603162
end
31613163

31623164

3163-
# 3163 "setup.ml"
3165+
# 3165 "setup.ml"
31643166
module BaseEnvLight = struct
31653167
(* # 22 "src/base/BaseEnvLight.ml" *)
31663168

@@ -3240,7 +3242,7 @@ module BaseEnvLight = struct
32403242
end
32413243

32423244

3243-
# 3243 "setup.ml"
3245+
# 3245 "setup.ml"
32443246
module BaseContext = struct
32453247
(* # 22 "src/base/BaseContext.ml" *)
32463248

@@ -5663,7 +5665,7 @@ module BaseCompat = struct
56635665
end
56645666

56655667

5666-
# 5666 "setup.ml"
5668+
# 5668 "setup.ml"
56675669
module InternalConfigurePlugin = struct
56685670
(* # 22 "src/plugins/internal/InternalConfigurePlugin.ml" *)
56695671

@@ -6469,7 +6471,7 @@ module InternalInstallPlugin = struct
64696471
end
64706472

64716473

6472-
# 6472 "setup.ml"
6474+
# 6474 "setup.ml"
64736475
module OCamlbuildCommon = struct
64746476
(* # 22 "src/plugins/ocamlbuild/OCamlbuildCommon.ml" *)
64756477

@@ -6842,7 +6844,7 @@ module OCamlbuildDocPlugin = struct
68426844
end
68436845

68446846

6845-
# 6845 "setup.ml"
6847+
# 6847 "setup.ml"
68466848
module CustomPlugin = struct
68476849
(* # 22 "src/plugins/custom/CustomPlugin.ml" *)
68486850

@@ -6974,7 +6976,7 @@ module CustomPlugin = struct
69746976
end
69756977

69766978

6977-
# 6977 "setup.ml"
6979+
# 6979 "setup.ml"
69786980
open OASISTypes;;
69796981

69806982
let setup_t =
@@ -7155,14 +7157,14 @@ let setup_t =
71557157
{
71567158
oasis_version = "0.4";
71577159
ocaml_version = Some (OASISVersion.VGreaterEqual "3.12");
7158-
version = "4.1.0";
7160+
version = "4.1.1";
71597161
license =
71607162
OASISLicense.DEP5License
71617163
(OASISLicense.DEP5Unit
71627164
{
7163-
OASISLicense.license = "LGPL";
7164-
excption = Some "OCaml linking";
7165-
version = OASISLicense.VersionOrLater "2.1"
7165+
OASISLicense.license = "Expat";
7166+
excption = None;
7167+
version = OASISLicense.NoVersion
71667168
});
71677169
findlib_version = Some (OASISVersion.VGreaterEqual "1.3.1");
71687170
alpha_features = [];
@@ -8525,16 +8527,17 @@ let setup_t =
85258527
plugin_data = []
85268528
};
85278529
oasis_fn = Some "_oasis";
8528-
oasis_version = "0.4.7";
8529-
oasis_digest = Some "$K\151\210\005\015\127\216g\1479\155*\233\217a";
8530+
oasis_version = "0.4.8";
8531+
oasis_digest =
8532+
Some "\142\247p7{\134\171\131\149\214\239A\240\181\230\147";
85308533
oasis_exec = None;
85318534
oasis_setup_args = [];
85328535
setup_update = false
85338536
};;
85348537

85358538
let setup () = BaseSetup.setup setup_t;;
85368539

8537-
# 8538 "setup.ml"
8540+
# 8541 "setup.ml"
85388541
let setup_t = BaseCompat.Compat_0_4.adapt_setup_t setup_t
85398542
open BaseCompat.Compat_0_4
85408543
(* OASIS_STOP *)

src/META

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# OASIS_START
2-
# DO NOT EDIT (digest: e7d3d70aac583192ffac8d82c81c8464)
3-
version = "4.1.0"
2+
# DO NOT EDIT (digest: 15e90ff04fdbec34526f8f3a17295244)
3+
version = "4.1.1"
44
description = "sqlite3-ocaml - SQLite3 bindings"
55
archive(byte) = "sqlite3.cma"
66
archive(byte, plugin) = "sqlite3.cma"

0 commit comments

Comments
 (0)