diff options
| author | Leitwolf | 2026-10-31 19:31:00 +0300 |
|---|---|---|
| committer | GitHub | 2026-10-31 19:31:00 +0300 |
| commit | 9e1687de6064756f470889e43dd69dfbb2f4ae61 (patch) | |
| tree | b4fee4c8d4c8d960158d82f50180fbb761bb0967 /tools | |
| parent | 326ea0c0213aeecb6b984bba3dabb0ebad97679e (diff) | |
| parent | 5a8606bb62aadb927bef5283aef804b4476fc91e (diff) | |
| download | catch3-9e1687de6064756f470889e43dd69dfbb2f4ae61.tar.gz | |
Merge pull request #23 from Progmasoft/license/exception-2.0
Move to the Progmasoft Linking Exception, Version 2.0
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/scripts/checkLicense.py | 2 | ||||
| -rwxr-xr-x | tools/scripts/generateAmalgamatedFiles.py | 4 | ||||
| -rwxr-xr-x | tools/scripts/updateThirdParty.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/scripts/checkLicense.py b/tools/scripts/checkLicense.py index 9e1e24ae..8b70b390 100755 --- a/tools/scripts/checkLicense.py +++ b/tools/scripts/checkLicense.py @@ -18,7 +18,7 @@ correct_licence = """\ progmasoft_licence = """\ // Copyright (c) 2026 Progmasoft. -// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-1.1 +// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 """ upstream_files = upstreamFiles() diff --git a/tools/scripts/generateAmalgamatedFiles.py b/tools/scripts/generateAmalgamatedFiles.py index de47e11d..b3151506 100755 --- a/tools/scripts/generateAmalgamatedFiles.py +++ b/tools/scripts/generateAmalgamatedFiles.py @@ -49,7 +49,7 @@ file_header = '''\ // // The parts that come from src/Progmasoft, the Catch3 runner, keep // their own copyright and license lines (MPL-2.0 WITH -// AdditionRef-Progmasoft-Exception-1.1). The runner needs C++17. +// AdditionRef-Progmasoft-Exception-2.0). The runner needs C++17. // ---------------------------------------------------------- ''' @@ -63,7 +63,7 @@ third_party_header = '''\ // third_party/. You probably shouldn't edit it directly. // // yyjson and pugixml keep their MIT licenses, stated in their text below; -// the rest is MPL-2.0 WITH AdditionRef-Progmasoft-Exception-1.1. Only +// the rest is MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0. Only // catch_amalgamated.cpp includes this file. // ---------------------------------------------------------- ''' diff --git a/tools/scripts/updateThirdParty.py b/tools/scripts/updateThirdParty.py index a28ead3c..c51e642b 100755 --- a/tools/scripts/updateThirdParty.py +++ b/tools/scripts/updateThirdParty.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # Copyright (c) 2026 Progmasoft. -# SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-1.1 +# SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 """Keeps third_party/ equal to the pinned release archives of its libraries. |