diff --git a/CHANGES.md b/CHANGES.md index 39fc4d3..2979d11 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,9 @@ +## v0.5.0 - 2022-06-06 + +- Migrate `ppx_regexp` to ppxlib. +- Change license exception for `ppx_regexp` to the LGPL-3.0 Linking + Exception. + ## v0.4.3 - 2019-11-25 - Fixed nested `[%pcre]` usage for `ppx_regexp`. diff --git a/COPYING.LINKING b/COPYING.LINKING new file mode 100644 index 0000000..551d66c --- /dev/null +++ b/COPYING.LINKING @@ -0,0 +1,19 @@ + LGPL-3.0 LINKING EXCEPTION + +As a special exception to the GNU Lesser General Public License +version 3 ("LGPL3"), the copyright holders of this Library give you +permission to convey to a third party a Combined Work that links +statically or dynamically to this Library without providing any +Minimal Corresponding Source or Minimal Application Code as set out in +4d or providing the installation information set out in section 4e, +provided that you comply with the other provisions of LGPL3 and +provided that you meet, for the Application the terms and conditions +of the license(s) which apply to the Application. + +Except as stated in this special exception, the provisions of LGPL3 +will continue to comply in full to this Library. If you modify this +Library, you may apply this exception to your version of this Library, +but you are not obliged to do so. If you do not wish to do so, delete +this exception statement from your version. This exception does not +(and cannot) modify any license terms which apply to the Application, +with which you must still comply. diff --git a/common/regexp.ml b/common/regexp.ml index fd8d05d..5e2c08b 100644 --- a/common/regexp.ml +++ b/common/regexp.ml @@ -1,9 +1,10 @@ -(* Copyright (C) 2018 Petter A. Urkedal +(* Copyright (C) 2018--2022 Petter A. Urkedal * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or (at your - * option) any later version, with the OCaml static compilation exception. + * option) any later version, with the OCaml static compilation exception or (at + * your option) the LGPL-3.0 Linking Exception. * * This library is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or diff --git a/common/regexp.mli b/common/regexp.mli index 64c6ae7..16ac5cd 100644 --- a/common/regexp.mli +++ b/common/regexp.mli @@ -3,7 +3,8 @@ * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or (at your - * option) any later version, with the OCaml static compilation exception. + * option) any later version, with the OCaml static compilation exception or (at + * your option) the LGPL-3.0 Linking Exception. * * This library is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or diff --git a/ppx_regexp.opam b/ppx_regexp.opam index 2bc0ccb..c818398 100644 --- a/ppx_regexp.opam +++ b/ppx_regexp.opam @@ -4,7 +4,7 @@ authors: [ "Petter A. Urkedal " "Gabriel Radanne " ] -license: "LGPL-3 with OCaml linking exception" +license: "LGPL-3.0-or-later WITH LGPL-3.0-linking-exception" homepage: "https://github.com/paurkedal/ppx_regexp" bug-reports: "https://github.com/paurkedal/ppx_regexp/issues" depends: [ diff --git a/ppx_regexp/ppx_regexp.ml b/ppx_regexp/ppx_regexp.ml index 7c8ea69..2e38791 100644 --- a/ppx_regexp/ppx_regexp.ml +++ b/ppx_regexp/ppx_regexp.ml @@ -3,7 +3,7 @@ * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or (at your - * option) any later version, with the OCaml static compilation exception. + * option) any later version, with the LGPL-3.0 Linking Exception. * * This library is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or diff --git a/tests/test_ppx_regexp.ml b/tests/test_ppx_regexp.ml index 4b488a7..8db15df 100644 --- a/tests/test_ppx_regexp.ml +++ b/tests/test_ppx_regexp.ml @@ -3,7 +3,7 @@ * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or (at your - * option) any later version, with the OCaml static compilation exception. + * option) any later version, with the LGPL-3.0 Linking Exception. * * This library is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or diff --git a/tests/test_regexp.ml b/tests/test_regexp.ml index c2f8c9f..c5796eb 100644 --- a/tests/test_regexp.ml +++ b/tests/test_regexp.ml @@ -3,7 +3,8 @@ * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or (at your - * option) any later version, with the OCaml static compilation exception. + * option) any later version, with the OCaml static compilation exception or (at + * your option) the LGPL-3.0 Linking Exception. * * This library is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or