diff --git a/.reuse/dep5 b/.reuse/dep5 deleted file mode 100644 index ee3ae0b44..000000000 --- a/.reuse/dep5 +++ /dev/null @@ -1,40 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: json -Upstream-Contact: Niels Lohmann -Source: https://github.com/nlohmann/json - -Files: * -Copyright: 2013-2026 Niels Lohmann -License: MIT - -Files: include/nlohmann/thirdparty/hedley.hpp -Copyright: 2016-2021 Evan Nemerson -License: CC0 - -Files: include/nlohmann/detail/meta/cpp_future.hpp -Copyright: 2013-2026 Niels Lohmann and 2018 The Abseil Authors -License: MIT AND Apache-2.0 - -Files: tests/thirdparty/doctest/* -Copyright: 2016-2023 Viktor Kirilov -License: MIT - -Files: tests/thirdparty/fifo_map/* -Copyright: 2015-2017 Niels Lohmann -License: MIT - -Files: tests/thirdparty/Fuzzer/* -Copyright: 2003-2022 LLVM Project. -License: Apache-2.0 - -Files: tests/thirdparty/imapdl/* -Copyright: 2017 Georg Sauthoff -License: GPL-3.0-only - -Files: tools/amalgamate/* -Copyright: 2012 Erik Edlund -License: BSD-3-Clause - -Files: tools/gdb_pretty_printer/* -Copyright: 2020 Hannes Domani -License: MIT diff --git a/FILES.md b/FILES.md index 263647146..fa6d94a84 100644 --- a/FILES.md +++ b/FILES.md @@ -207,19 +207,19 @@ Further documentation: ## REUSE -### `.reuse/dep5` +### `REUSE.toml` The file defines the licenses of certain third-party components in the repository. The root `Makefile` contains a target `reuse` that checks for compliance. Further documentation: -- [DEP5](https://reuse.software/spec-3.2/#dep5-deprecated) +- [REUSE.toml](https://reuse.software/spec-3.3/#reusetoml) - [reuse command-line tool](https://pypi.org/project/reuse/) - [documentation of linting](https://reuse.readthedocs.io/en/stable/man/reuse-lint.html) - [REUSE](http://reuse.software) > [!IMPORTANT] -> The filename `.reuse/dep5` is predetermined by REUSE. Alternatively, a `REUSE.toml` file can be used. +> The filename `REUSE.toml` is predetermined by REUSE. Alternatively, a `.reuse/dep5` file (deprecated) can be used. ### `.reuse/templates` diff --git a/README.md b/README.md index f173dfdb9..ee04fadda 100644 --- a/README.md +++ b/README.md @@ -1405,7 +1405,7 @@ The library is compliant to version 3.3 of the [**REUSE specification**](https:/ - Every source file contains an SPDX copyright header. - The full text of all licenses used in the repository can be found in the `LICENSES` folder. -- File `.reuse/dep5` contains an overview of all files' copyrights and licenses. +- File `REUSE.toml` contains an overview of all files' copyrights and licenses. - Run `pipx run reuse lint` to verify the project's REUSE compliance and `pipx run reuse spdx` to generate a SPDX SBOM. ## Contact diff --git a/REUSE.toml b/REUSE.toml new file mode 100644 index 000000000..3e191c6e9 --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,58 @@ +version = 1 +SPDX-PackageName = "json" +SPDX-PackageSupplier = "Niels Lohmann " +SPDX-PackageDownloadLocation = "https://github.com/nlohmann/json" + +[[annotations]] +path = "**" +precedence = "aggregate" +SPDX-FileCopyrightText = "2013-2026 Niels Lohmann " +SPDX-License-Identifier = "MIT" + +[[annotations]] +path = "include/nlohmann/thirdparty/hedley.hpp" +precedence = "aggregate" +SPDX-FileCopyrightText = "2016-2021 Evan Nemerson " +SPDX-License-Identifier = "CC0" + +[[annotations]] +path = "include/nlohmann/detail/meta/cpp_future.hpp" +precedence = "aggregate" +SPDX-FileCopyrightText = "2013-2026 Niels Lohmann and 2018 The Abseil Authors" +SPDX-License-Identifier = "MIT AND Apache-2.0" + +[[annotations]] +path = "tests/thirdparty/doctest/**" +precedence = "aggregate" +SPDX-FileCopyrightText = "2016-2023 Viktor Kirilov" +SPDX-License-Identifier = "MIT" + +[[annotations]] +path = "tests/thirdparty/fifo_map/**" +precedence = "aggregate" +SPDX-FileCopyrightText = "2015-2017 Niels Lohmann" +SPDX-License-Identifier = "MIT" + +[[annotations]] +path = "tests/thirdparty/Fuzzer/**" +precedence = "aggregate" +SPDX-FileCopyrightText = "2003-2022 LLVM Project." +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "tests/thirdparty/imapdl/**" +precedence = "aggregate" +SPDX-FileCopyrightText = "2017 Georg Sauthoff " +SPDX-License-Identifier = "GPL-3.0-only" + +[[annotations]] +path = "tools/amalgamate/**" +precedence = "aggregate" +SPDX-FileCopyrightText = "2012 Erik Edlund " +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = "tools/gdb_pretty_printer/**" +precedence = "aggregate" +SPDX-FileCopyrightText = "2020 Hannes Domani " +SPDX-License-Identifier = "MIT" diff --git a/cmake/scripts/gen_hedley_undef_check.cmake b/cmake/scripts/gen_hedley_undef_check.cmake index fc8cfec2c..f796588c6 100644 --- a/cmake/scripts/gen_hedley_undef_check.cmake +++ b/cmake/scripts/gen_hedley_undef_check.cmake @@ -64,7 +64,7 @@ if(MODE STREQUAL "undef") # recipe is self-contained and its output is byte-stable across reruns. # The embedded SPDX tags below are part of the *generated* file's # content, not a REUSE header for this .cmake script itself (which is - # already covered by the blanket "Files: *" rule in .reuse/dep5) -- keep + # already covered by the blanket path = "**" rule in REUSE.toml) -- keep # them wrapped in REUSE-IgnoreStart/End so `reuse lint` does not try to # parse "MIT\n")" as this file's own SPDX-License-Identifier value. # REUSE-IgnoreStart