diff options
| author | Leitwolf | 2026-11-15 22:58:40 +0300 |
|---|---|---|
| committer | GitHub | 2026-11-15 22:58:40 +0300 |
| commit | 21ce423a12523559abf83f7a2ed83e042efc418d (patch) | |
| tree | e83ae3454c5692f46c70876fb60fcc62828b2142 /tools | |
| parent | 79f624d693b4fc3167c239c3eca47c858799333f (diff) | |
| parent | 2fbb5585e35078cb2490c8ae988860aa6dc0399d (diff) | |
| download | catch3-security/bounded-strings.tar.gz | |
Merge branch 'devel' into security/bounded-stringssecurity/bounded-strings
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/AmalgamateMain.cpp | 2 | ||||
| -rw-r--r-- | tools/Amalgamation.cpp | 8 | ||||
| -rw-r--r-- | tools/Amalgamation.hpp | 2 | ||||
| -rw-r--r-- | tools/BUILD.bazel | 2 | ||||
| -rw-r--r-- | tools/CheckMain.cpp | 2 | ||||
| -rw-r--r-- | tools/Checks.cpp | 4 | ||||
| -rw-r--r-- | tools/Checks.hpp | 2 | ||||
| -rw-r--r-- | tools/ReleaseNotesMain.cpp | 2 | ||||
| -rw-r--r-- | tools/RepoInfoMain.cpp | 2 | ||||
| -rw-r--r-- | tools/Repository.cpp | 2 | ||||
| -rw-r--r-- | tools/Repository.hpp | 2 | ||||
| -rw-r--r-- | tools/RepositoryReport.cpp | 2 | ||||
| -rw-r--r-- | tools/RepositoryReport.hpp | 2 | ||||
| -rw-r--r-- | tools/ThirdPartyMain.cpp | 2 | ||||
| -rw-r--r-- | tools/Tools.tests.cpp | 2 | ||||
| -rw-r--r-- | tools/VersionMain.cpp | 2 | ||||
| -rw-r--r-- | tools/Versions.cpp | 2 | ||||
| -rw-r--r-- | tools/Versions.hpp | 2 |
18 files changed, 22 insertions, 22 deletions
diff --git a/tools/AmalgamateMain.cpp b/tools/AmalgamateMain.cpp index c5e2218c..2c1c3be5 100644 --- a/tools/AmalgamateMain.cpp +++ b/tools/AmalgamateMain.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2026 Progmasoft. -// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 +// SPDX-License-Identifier: LGPL-3.0-or-later // bazelisk run //tools:amalgamate [-- --check] diff --git a/tools/Amalgamation.cpp b/tools/Amalgamation.cpp index fc1d459a..bb396cb1 100644 --- a/tools/Amalgamation.cpp +++ b/tools/Amalgamation.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2026 Progmasoft. -// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 +// SPDX-License-Identifier: LGPL-3.0-or-later #include <algorithm> #include <array> @@ -33,8 +33,8 @@ namespace Progmasoft::Catch3::Tools // You probably shouldn't edit it directly. // // The parts that come from src/Progmasoft, the Catch3 runner, keep -// their own copyright and license lines (MPL-2.0 WITH -// AdditionRef-Progmasoft-Exception-2.0). The runner needs C++17. +// their own copyright and license lines (LGPL-3.0-or-later). The +// runner needs C++17. // ---------------------------------------------------------- )"; @@ -45,7 +45,7 @@ namespace Progmasoft::Catch3::Tools // 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-2.0. Only +// the rest is LGPL-3.0-or-later. Only // catch_amalgamated.cpp includes this file. // ---------------------------------------------------------- )"; diff --git a/tools/Amalgamation.hpp b/tools/Amalgamation.hpp index 262e56d9..5a11c010 100644 --- a/tools/Amalgamation.hpp +++ b/tools/Amalgamation.hpp @@ -1,5 +1,5 @@ // Copyright (c) 2026 Progmasoft. -// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 +// SPDX-License-Identifier: LGPL-3.0-or-later #pragma once #include <filesystem> diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel index fbe960aa..b8193d77 100644 --- a/tools/BUILD.bazel +++ b/tools/BUILD.bazel @@ -1,5 +1,5 @@ # Copyright (c) 2026 Progmasoft. -# SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 +# SPDX-License-Identifier: LGPL-3.0-or-later load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test") # The tools of this repository. They work on the checkout: diff --git a/tools/CheckMain.cpp b/tools/CheckMain.cpp index ee37d868..6c25467a 100644 --- a/tools/CheckMain.cpp +++ b/tools/CheckMain.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2026 Progmasoft. -// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 +// SPDX-License-Identifier: LGPL-3.0-or-later // bazelisk run //tools:check diff --git a/tools/Checks.cpp b/tools/Checks.cpp index a348eff4..473b740a 100644 --- a/tools/Checks.cpp +++ b/tools/Checks.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2026 Progmasoft. -// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 +// SPDX-License-Identifier: LGPL-3.0-or-later #include <algorithm> #include <set> @@ -27,7 +27,7 @@ namespace Progmasoft::Catch3::Tools constexpr std::string_view kProgmasoftLicense = R"(// Copyright (c) 2026 Progmasoft. -// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 +// SPDX-License-Identifier: LGPL-3.0-or-later )"; [[nodiscard]] bool diff --git a/tools/Checks.hpp b/tools/Checks.hpp index 16d698a0..88662b73 100644 --- a/tools/Checks.hpp +++ b/tools/Checks.hpp @@ -1,5 +1,5 @@ // Copyright (c) 2026 Progmasoft. -// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 +// SPDX-License-Identifier: LGPL-3.0-or-later #pragma once #include <filesystem> diff --git a/tools/ReleaseNotesMain.cpp b/tools/ReleaseNotesMain.cpp index b32b57b0..7860060f 100644 --- a/tools/ReleaseNotesMain.cpp +++ b/tools/ReleaseNotesMain.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2026 Progmasoft. -// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 +// SPDX-License-Identifier: LGPL-3.0-or-later // bazelisk run //tools:release_notes -- [version] // diff --git a/tools/RepoInfoMain.cpp b/tools/RepoInfoMain.cpp index 23b7e232..f7db5996 100644 --- a/tools/RepoInfoMain.cpp +++ b/tools/RepoInfoMain.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2026 Progmasoft. -// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 +// SPDX-License-Identifier: LGPL-3.0-or-later // bazelisk run //tools:repo_info [-- --json] // diff --git a/tools/Repository.cpp b/tools/Repository.cpp index 0c08a36c..8ede5408 100644 --- a/tools/Repository.cpp +++ b/tools/Repository.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2026 Progmasoft. -// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 +// SPDX-License-Identifier: LGPL-3.0-or-later #include <algorithm> #include <cstdlib> diff --git a/tools/Repository.hpp b/tools/Repository.hpp index 356dc6c8..f2fd8ab3 100644 --- a/tools/Repository.hpp +++ b/tools/Repository.hpp @@ -1,5 +1,5 @@ // Copyright (c) 2026 Progmasoft. -// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 +// SPDX-License-Identifier: LGPL-3.0-or-later #pragma once #include <filesystem> diff --git a/tools/RepositoryReport.cpp b/tools/RepositoryReport.cpp index f985335e..41abb924 100644 --- a/tools/RepositoryReport.cpp +++ b/tools/RepositoryReport.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2026 Progmasoft. -// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 +// SPDX-License-Identifier: LGPL-3.0-or-later #include <algorithm> #include <array> diff --git a/tools/RepositoryReport.hpp b/tools/RepositoryReport.hpp index 05c3bef9..99ea49ce 100644 --- a/tools/RepositoryReport.hpp +++ b/tools/RepositoryReport.hpp @@ -1,5 +1,5 @@ // Copyright (c) 2026 Progmasoft. -// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 +// SPDX-License-Identifier: LGPL-3.0-or-later #pragma once #include <filesystem> diff --git a/tools/ThirdPartyMain.cpp b/tools/ThirdPartyMain.cpp index 796c6182..76d143fa 100644 --- a/tools/ThirdPartyMain.cpp +++ b/tools/ThirdPartyMain.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2026 Progmasoft. -// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 +// SPDX-License-Identifier: LGPL-3.0-or-later // bazelisk run //tools:third_party -- --check // bazelisk run //tools:third_party -- --update diff --git a/tools/Tools.tests.cpp b/tools/Tools.tests.cpp index c505b966..24d981c9 100644 --- a/tools/Tools.tests.cpp +++ b/tools/Tools.tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2026 Progmasoft. -// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 +// SPDX-License-Identifier: LGPL-3.0-or-later #include <Progmasoft/Catch3/Matchers/String.hpp> #include <Progmasoft/Catch3/TestMacros.hpp> diff --git a/tools/VersionMain.cpp b/tools/VersionMain.cpp index 2c9c5456..bc7df41a 100644 --- a/tools/VersionMain.cpp +++ b/tools/VersionMain.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2026 Progmasoft. -// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 +// SPDX-License-Identifier: LGPL-3.0-or-later // bazelisk run //tools:version prints the current version // bazelisk run //tools:version -- --next moves to the next patch release diff --git a/tools/Versions.cpp b/tools/Versions.cpp index d3ae03cf..217702cf 100644 --- a/tools/Versions.cpp +++ b/tools/Versions.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2026 Progmasoft. -// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 +// SPDX-License-Identifier: LGPL-3.0-or-later #include <algorithm> #include <cctype> diff --git a/tools/Versions.hpp b/tools/Versions.hpp index a1fdf4a6..a69889eb 100644 --- a/tools/Versions.hpp +++ b/tools/Versions.hpp @@ -1,5 +1,5 @@ // Copyright (c) 2026 Progmasoft. -// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 +// SPDX-License-Identifier: LGPL-3.0-or-later #pragma once #include <array> |