Skip to content

Commit

Permalink
Change license exception for ppx_regexp and adjust change log.
Browse files Browse the repository at this point in the history
  • Loading branch information
paurkedal committed Jun 6, 2022
1 parent d01f478 commit 9604bc0
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 7 deletions.
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -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`.
Expand Down
19 changes: 19 additions & 0 deletions COPYING.LINKING
Original file line number Diff line number Diff line change
@@ -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.
5 changes: 3 additions & 2 deletions common/regexp.ml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
(* Copyright (C) 2018 Petter A. Urkedal <[email protected]>
(* Copyright (C) 2018--2022 Petter A. Urkedal <[email protected]>
*
* 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
Expand Down
3 changes: 2 additions & 1 deletion common/regexp.mli
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ppx_regexp.opam
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ authors: [
"Petter A. Urkedal <[email protected]>"
"Gabriel Radanne <[email protected]>"
]
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: [
Expand Down
2 changes: 1 addition & 1 deletion ppx_regexp/ppx_regexp.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/test_ppx_regexp.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion tests/test_regexp.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9604bc0

Please sign in to comment.