Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/docs
diff options
context:
space:
mode:
authorLeitwolf112026-11-15 14:01:10 +0300
committerLeitwolf112026-11-15 14:01:10 +0300
commit5c865488e762dec616a0c483d0fc07250123c387 (patch)
tree08bc3614a575a8bfbea2c8ca96f269eeea207a1b /docs
parent8979c1caf2eee321cf497671805d2177980c421e (diff)
downloadcatch3-5c865488e762dec616a0c483d0fc07250123c387.tar.gz
License Catch3's Progmasoft files under LGPL-3.0-or-later
Every Progmasoft-authored file moves from MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 to LGPL-3.0-or-later, from 0.5.0 on. Catch2-originated files keep BSL-1.0, and the vendored yyjson and pugixml keep MIT. - LICENSES/ holds the LGPL-3.0 text and the GPL-3.0 text it builds on, both as published by the FSF; the MPL-2.0 and Progmasoft Exception texts go, since no file uses them any more. - Five files that came from Catch2 and were rewritten by Progmasoft (.clang-format, the issue and pull request templates, SECURITY.md) keep Catch2's notice next to Progmasoft's and say LGPL-3.0-or-later AND BSL-1.0. - //tools:check expects the new header of Progmasoft files; the amalgamation notes say LGPL-3.0-or-later and the amalgamated files are regenerated; meson's project license is BSL-1.0 and LGPL-3.0-or-later. - README gains a License section; LICENSES/README.md, contributing.md and progmasoft-catch3.md describe the new split and that releases before 0.5.0 keep the license they were published under. Every commit to Progmasoft's files since the fork is the maintainer's. Claude-Session: https://claude.ai/code/session_01Ji7xZMYjc4zankoc7hGBE1
Diffstat (limited to 'docs')
-rw-r--r--docs/contributing.md3
-rw-r--r--docs/progmasoft-catch3.md4
2 files changed, 3 insertions, 4 deletions
diff --git a/docs/contributing.md b/docs/contributing.md
index 4edecee2..ae61a9d5 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -80,8 +80,7 @@ must keep compiling. It stays under the Boost Software License 1.0, keeps the
Code that includes its headers needs C++17 or later.
`src/Progmasoft` holds what Progmasoft adds: the runner, the results model,
-property testing and snapshots. It is licensed `MPL-2.0 WITH
-AdditionRef-Progmasoft-Exception-2.0`, follows the
+property testing and snapshots. It is licensed `LGPL-3.0-or-later`, follows the
[Progmasoft Core C++ Coding Guidelines](https://github.com/Progmasoft/progmasoft-cpp), is
C++17, reports recoverable errors with `Expected` rather than exceptions, and
is formatted with the `.clang-format` beside it.
diff --git a/docs/progmasoft-catch3.md b/docs/progmasoft-catch3.md
index 49754af1..ee222e6d 100644
--- a/docs/progmasoft-catch3.md
+++ b/docs/progmasoft-catch3.md
@@ -232,8 +232,8 @@ Do not rename or rewrite Catch2 headers, `Catch` symbols, macros, runner options
or upstream coding style as part of this extension. New functionality belongs
in separately licensed Progmasoft headers and uses Progmasoft's PascalCase C++
types/functions and project naming conventions. Catch2-originated source files
-remain under BSL-1.0; Progmasoft-authored source files carry the MPL-2.0 plus
-Progmasoft linking-exception SPDX expression shown in their headers. The two
+remain under BSL-1.0; Progmasoft-authored source files are under
+LGPL-3.0-or-later, as their headers say. The two
areas are not relicensed as a whole. Any proposed upstream PR must be prepared
under Catch2's contribution rules as a separate contribution, rather than
reusing a source file whose license header says otherwise.