From 4c6ed76c7153d2589f6b59101b0835b9d47f18fe Mon Sep 17 00:00:00 2001 From: Markus Mottl Date: Tue, 3 Jan 2017 17:18:08 -0500 Subject: [PATCH] Fixed incorrect license reference in Oasis specification --- CHANGES.txt | 3 +++ _oasis | 4 ++-- myocamlbuild.ml | 9 ++++++--- setup.ml | 33 ++++++++++++++++++--------------- src/META | 4 ++-- 5 files changed, 31 insertions(+), 22 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 13c34fa..c175824 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,6 @@ +2017-01-03: Fixed incorrect LGPL license reference in Oasis specification. + The software is actually distributed under the Expat-license. + 2016-12-15: Added new functions for more efficient and convenient blob access: * column_blob diff --git a/_oasis b/_oasis index 3955ca0..37d103c 100644 --- a/_oasis +++ b/_oasis @@ -1,6 +1,6 @@ OASISFormat: 0.4 Name: sqlite3 -Version: 4.1.0 +Version: 4.1.1 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, @@ -17,7 +17,7 @@ Copyrights: (C) 2007-2010 Jane Street Holding LLC , Christian Szegedy LicenseFile: COPYING.txt -License: LGPL-2.1+ with OCaml linking exception +License: Expat OCamlVersion: >= 3.12 FindlibVersion: >= 1.3.1 Homepage: http://mmottl.github.io/sqlite3-ocaml diff --git a/myocamlbuild.ml b/myocamlbuild.ml index 6e6cf6e..67c0696 100644 --- a/myocamlbuild.ml +++ b/myocamlbuild.ml @@ -1,5 +1,5 @@ (* OASIS_START *) -(* DO NOT EDIT (digest: 1761a7bf1d47c07450e996a24c039b63) *) +(* DO NOT EDIT (digest: 5ad2202fdae1797c21756995bc2c9791) *) module OASISGettext = struct (* # 22 "src/oasis/OASISGettext.ml" *) @@ -746,6 +746,9 @@ module MyOCamlbuildBase = struct (* # 110 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *) + let env_filename = Pathname.basename BaseEnvLight.default_filename + + let dispatch_combine lst = fun e -> List.iter @@ -878,7 +881,7 @@ module MyOCamlbuildBase = struct end -# 881 "myocamlbuild.ml" +# 884 "myocamlbuild.ml" open Ocamlbuild_plugin;; let package_default = { @@ -987,7 +990,7 @@ let conf = {MyOCamlbuildFindlib.no_automatic_syntax = false} let dispatch_default = MyOCamlbuildBase.dispatch_default conf package_default;; -# 991 "myocamlbuild.ml" +# 994 "myocamlbuild.ml" (* OASIS_STOP *) let read_lines_from_cmd ~max_lines cmd = diff --git a/setup.ml b/setup.ml index 12a8540..ac460cd 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: 4d1117fdef16d5bfd3ab11d080ff8644) *) +(* DO NOT EDIT (digest: ca0a65af2ec3c9934900a490b3a6e221) *) (* - Regenerated by OASIS v0.4.7 + Regenerated by OASIS v0.4.8 Visit http://oasis.forge.ocamlcore.org for more information and documentation about functions used in this file. *) @@ -658,6 +658,7 @@ module OASISContext = struct ignore_unknown_fields: bool; printf: level -> string -> unit; srcfs: source OASISFileSystem.fs; + load_oasis_plugin: string -> bool; } @@ -682,6 +683,7 @@ module OASISContext = struct ignore_unknown_fields = false; printf = printf; srcfs = new OASISFileSystem.host_fs(Sys.getcwd ()); + load_oasis_plugin = (fun _ -> false); } @@ -3160,7 +3162,7 @@ module OASISFileUtil = struct end -# 3163 "setup.ml" +# 3165 "setup.ml" module BaseEnvLight = struct (* # 22 "src/base/BaseEnvLight.ml" *) @@ -3240,7 +3242,7 @@ module BaseEnvLight = struct end -# 3243 "setup.ml" +# 3245 "setup.ml" module BaseContext = struct (* # 22 "src/base/BaseContext.ml" *) @@ -5663,7 +5665,7 @@ module BaseCompat = struct end -# 5666 "setup.ml" +# 5668 "setup.ml" module InternalConfigurePlugin = struct (* # 22 "src/plugins/internal/InternalConfigurePlugin.ml" *) @@ -6469,7 +6471,7 @@ module InternalInstallPlugin = struct end -# 6472 "setup.ml" +# 6474 "setup.ml" module OCamlbuildCommon = struct (* # 22 "src/plugins/ocamlbuild/OCamlbuildCommon.ml" *) @@ -6842,7 +6844,7 @@ module OCamlbuildDocPlugin = struct end -# 6845 "setup.ml" +# 6847 "setup.ml" module CustomPlugin = struct (* # 22 "src/plugins/custom/CustomPlugin.ml" *) @@ -6974,7 +6976,7 @@ module CustomPlugin = struct end -# 6977 "setup.ml" +# 6979 "setup.ml" open OASISTypes;; let setup_t = @@ -7155,14 +7157,14 @@ let setup_t = { oasis_version = "0.4"; ocaml_version = Some (OASISVersion.VGreaterEqual "3.12"); - version = "4.1.0"; + version = "4.1.1"; license = OASISLicense.DEP5License (OASISLicense.DEP5Unit { - OASISLicense.license = "LGPL"; - excption = Some "OCaml linking"; - version = OASISLicense.VersionOrLater "2.1" + OASISLicense.license = "Expat"; + excption = None; + version = OASISLicense.NoVersion }); findlib_version = Some (OASISVersion.VGreaterEqual "1.3.1"); alpha_features = []; @@ -8525,8 +8527,9 @@ let setup_t = plugin_data = [] }; oasis_fn = Some "_oasis"; - oasis_version = "0.4.7"; - oasis_digest = Some "$K\151\210\005\015\127\216g\1479\155*\233\217a"; + oasis_version = "0.4.8"; + oasis_digest = + Some "\142\247p7{\134\171\131\149\214\239A\240\181\230\147"; oasis_exec = None; oasis_setup_args = []; setup_update = false @@ -8534,7 +8537,7 @@ let setup_t = let setup () = BaseSetup.setup setup_t;; -# 8538 "setup.ml" +# 8541 "setup.ml" let setup_t = BaseCompat.Compat_0_4.adapt_setup_t setup_t open BaseCompat.Compat_0_4 (* OASIS_STOP *) diff --git a/src/META b/src/META index 726e7fa..fd6cef4 100644 --- a/src/META +++ b/src/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: e7d3d70aac583192ffac8d82c81c8464) -version = "4.1.0" +# DO NOT EDIT (digest: 15e90ff04fdbec34526f8f3a17295244) +version = "4.1.1" description = "sqlite3-ocaml - SQLite3 bindings" archive(byte) = "sqlite3.cma" archive(byte, plugin) = "sqlite3.cma"