Skip to content

Commit 9604bc0

Browse files
committed
Change license exception for ppx_regexp and adjust change log.
1 parent d01f478 commit 9604bc0

File tree

8 files changed

+35
-7
lines changed

8 files changed

+35
-7
lines changed

CHANGES.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## v0.5.0 - 2022-06-06
2+
3+
- Migrate `ppx_regexp` to ppxlib.
4+
- Change license exception for `ppx_regexp` to the LGPL-3.0 Linking
5+
Exception.
6+
17
## v0.4.3 - 2019-11-25
28

39
- Fixed nested `[%pcre]` usage for `ppx_regexp`.

COPYING.LINKING

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
LGPL-3.0 LINKING EXCEPTION
2+
3+
As a special exception to the GNU Lesser General Public License
4+
version 3 ("LGPL3"), the copyright holders of this Library give you
5+
permission to convey to a third party a Combined Work that links
6+
statically or dynamically to this Library without providing any
7+
Minimal Corresponding Source or Minimal Application Code as set out in
8+
4d or providing the installation information set out in section 4e,
9+
provided that you comply with the other provisions of LGPL3 and
10+
provided that you meet, for the Application the terms and conditions
11+
of the license(s) which apply to the Application.
12+
13+
Except as stated in this special exception, the provisions of LGPL3
14+
will continue to comply in full to this Library. If you modify this
15+
Library, you may apply this exception to your version of this Library,
16+
but you are not obliged to do so. If you do not wish to do so, delete
17+
this exception statement from your version. This exception does not
18+
(and cannot) modify any license terms which apply to the Application,
19+
with which you must still comply.

common/regexp.ml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
(* Copyright (C) 2018 Petter A. Urkedal <[email protected]>
1+
(* Copyright (C) 2018--2022 Petter A. Urkedal <[email protected]>
22
*
33
* This library is free software; you can redistribute it and/or modify it
44
* under the terms of the GNU Lesser General Public License as published by
55
* the Free Software Foundation, either version 3 of the License, or (at your
6-
* option) any later version, with the OCaml static compilation exception.
6+
* option) any later version, with the OCaml static compilation exception or (at
7+
* your option) the LGPL-3.0 Linking Exception.
78
*
89
* This library is distributed in the hope that it will be useful, but WITHOUT
910
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

common/regexp.mli

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
* This library is free software; you can redistribute it and/or modify it
44
* under the terms of the GNU Lesser General Public License as published by
55
* the Free Software Foundation, either version 3 of the License, or (at your
6-
* option) any later version, with the OCaml static compilation exception.
6+
* option) any later version, with the OCaml static compilation exception or (at
7+
* your option) the LGPL-3.0 Linking Exception.
78
*
89
* This library is distributed in the hope that it will be useful, but WITHOUT
910
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

ppx_regexp.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ authors: [
44
"Petter A. Urkedal <[email protected]>"
55
"Gabriel Radanne <[email protected]>"
66
]
7-
license: "LGPL-3 with OCaml linking exception"
7+
license: "LGPL-3.0-or-later WITH LGPL-3.0-linking-exception"
88
homepage: "https://github.com/paurkedal/ppx_regexp"
99
bug-reports: "https://github.com/paurkedal/ppx_regexp/issues"
1010
depends: [

ppx_regexp/ppx_regexp.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* This library is free software; you can redistribute it and/or modify it
44
* under the terms of the GNU Lesser General Public License as published by
55
* the Free Software Foundation, either version 3 of the License, or (at your
6-
* option) any later version, with the OCaml static compilation exception.
6+
* option) any later version, with the LGPL-3.0 Linking Exception.
77
*
88
* This library is distributed in the hope that it will be useful, but WITHOUT
99
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

tests/test_ppx_regexp.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* This library is free software; you can redistribute it and/or modify it
44
* under the terms of the GNU Lesser General Public License as published by
55
* the Free Software Foundation, either version 3 of the License, or (at your
6-
* option) any later version, with the OCaml static compilation exception.
6+
* option) any later version, with the LGPL-3.0 Linking Exception.
77
*
88
* This library is distributed in the hope that it will be useful, but WITHOUT
99
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

tests/test_regexp.ml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
* This library is free software; you can redistribute it and/or modify it
44
* under the terms of the GNU Lesser General Public License as published by
55
* the Free Software Foundation, either version 3 of the License, or (at your
6-
* option) any later version, with the OCaml static compilation exception.
6+
* option) any later version, with the OCaml static compilation exception or (at
7+
* your option) the LGPL-3.0 Linking Exception.
78
*
89
* This library is distributed in the hope that it will be useful, but WITHOUT
910
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

0 commit comments

Comments
 (0)