From ac4715cdfcf3e3e02d022d9df1a57bcf6998aa2c Mon Sep 17 00:00:00 2001 From: Mathis Kelm <mathis.kelm@iws.uni-stuttgart.de> Date: Tue, 14 Mar 2023 19:49:48 +0100 Subject: [PATCH] [license] (partial) licensing of adapted code [license] Add SPDX headers for fmt [license] Add SPDX headers for tinyxml2 [license] Add SPDX headers for doxygen-awesome [license] Add SPDX headers to installexternal.py [license] Add SPDX headers to doubleexp integration [license] partial licensing of doxygen math filter --- bin/installexternal.py | 6 ++++++ doc/doxygen/doxygen-awesome-darkmode-toggle.js | 2 ++ doc/doxygen/doxygen-awesome-fragment-copy-button.js | 2 ++ doc/doxygen/doxygen-awesome-interactive-toc.js | 2 ++ doc/doxygen/doxygen-awesome-paragraph-link.js | 2 ++ .../doxygen-awesome-sidebar-only-darkmode-toggle.css | 2 ++ doc/doxygen/doxygen-awesome-sidebar-only.css | 2 ++ doc/doxygen/doxygen-awesome.css | 2 ++ doc/doxygen/markdown-math-filter.pl | 6 ++++++ dumux/common/doubleexpintegrationconstants.hh | 9 +++++++++ dumux/common/doubleexpintegrator.hh | 9 +++++++++ dumux/io/format/fmt/README.rst | 4 ++++ dumux/io/format/fmt/VERSION.rst | 4 ++++ dumux/io/format/fmt/core.h | 4 ++++ dumux/io/format/fmt/format-inl.h | 4 ++++ dumux/io/format/fmt/format.cc | 4 ++++ dumux/io/format/fmt/format.h | 4 ++++ dumux/io/format/fmt/ranges.h | 5 +++++ dumux/io/xml/tinyxml2.cpp | 2 ++ dumux/io/xml/tinyxml2.h | 4 ++++ 20 files changed, 79 insertions(+) diff --git a/bin/installexternal.py b/bin/installexternal.py index 3fd7951bdc..be197d4fa6 100755 --- a/bin/installexternal.py +++ b/bin/installexternal.py @@ -1,4 +1,10 @@ #!/usr/bin/env python3 +# SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder +# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightInfo: Copyright (c) 2020 Andrew Scott +# SPDX-License-Identifier: MIT +# The class TarSafe is adapted from https://github.com/beatsbears/tarsafe, licensed under MIT. All +# Changes are licensed under GPL-3.0-or-later. """ install external stuff for dumux diff --git a/doc/doxygen/doxygen-awesome-darkmode-toggle.js b/doc/doxygen/doxygen-awesome-darkmode-toggle.js index 40fe2d38e0..9760307bc9 100644 --- a/doc/doxygen/doxygen-awesome-darkmode-toggle.js +++ b/doc/doxygen/doxygen-awesome-darkmode-toggle.js @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightInfo: Copyright (c) 2021 - 2023 jothepro +// SPDX-License-Identifier: MIT /** Doxygen Awesome diff --git a/doc/doxygen/doxygen-awesome-fragment-copy-button.js b/doc/doxygen/doxygen-awesome-fragment-copy-button.js index 86c16fd93a..144c6b55fa 100644 --- a/doc/doxygen/doxygen-awesome-fragment-copy-button.js +++ b/doc/doxygen/doxygen-awesome-fragment-copy-button.js @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightInfo: Copyright (c) 2022 - 2023 jothepro +// SPDX-License-Identifier: MIT /** Doxygen Awesome diff --git a/doc/doxygen/doxygen-awesome-interactive-toc.js b/doc/doxygen/doxygen-awesome-interactive-toc.js index 20a9669d7d..906c7e2113 100644 --- a/doc/doxygen/doxygen-awesome-interactive-toc.js +++ b/doc/doxygen/doxygen-awesome-interactive-toc.js @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightInfo: Copyright (c) 2022 - 2023 jothepro +// SPDX-License-Identifier: MIT /** Doxygen Awesome diff --git a/doc/doxygen/doxygen-awesome-paragraph-link.js b/doc/doxygen/doxygen-awesome-paragraph-link.js index e53d132cea..71621059f0 100644 --- a/doc/doxygen/doxygen-awesome-paragraph-link.js +++ b/doc/doxygen/doxygen-awesome-paragraph-link.js @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightInfo: Copyright (c) 2022 - 2023 jothepro +// SPDX-License-Identifier: MIT /** Doxygen Awesome diff --git a/doc/doxygen/doxygen-awesome-sidebar-only-darkmode-toggle.css b/doc/doxygen/doxygen-awesome-sidebar-only-darkmode-toggle.css index d207446e0b..21aa869dbe 100644 --- a/doc/doxygen/doxygen-awesome-sidebar-only-darkmode-toggle.css +++ b/doc/doxygen/doxygen-awesome-sidebar-only-darkmode-toggle.css @@ -1,3 +1,5 @@ +/* SPDX-FileCopyrightInfo: Copyright (c) 2021 - 2023 jothepro */ +/* SPDX-License-Identifier: MIT */ /** diff --git a/doc/doxygen/doxygen-awesome-sidebar-only.css b/doc/doxygen/doxygen-awesome-sidebar-only.css index bab874b791..6c4335e563 100644 --- a/doc/doxygen/doxygen-awesome-sidebar-only.css +++ b/doc/doxygen/doxygen-awesome-sidebar-only.css @@ -1,3 +1,5 @@ +/* SPDX-FileCopyrightInfo: Copyright (c) 2021 - 2023 jothepro */ +/* SPDX-License-Identifier: MIT */ /** Doxygen Awesome diff --git a/doc/doxygen/doxygen-awesome.css b/doc/doxygen/doxygen-awesome.css index 41898d9a96..d9489388a6 100644 --- a/doc/doxygen/doxygen-awesome.css +++ b/doc/doxygen/doxygen-awesome.css @@ -1,3 +1,5 @@ +/* SPDX-FileCopyrightInfo: Copyright (c) 2021 - 2023 jothepro */ +/* SPDX-License-Identifier: MIT */ /** Doxygen Awesome diff --git a/doc/doxygen/markdown-math-filter.pl b/doc/doxygen/markdown-math-filter.pl index c764ff399d..83bbee8358 100755 --- a/doc/doxygen/markdown-math-filter.pl +++ b/doc/doxygen/markdown-math-filter.pl @@ -1,4 +1,10 @@ #!/usr/bin/env perl +# SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder +# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightInfo: Copyright 2017 - 2023 Simulating eXtreme Spacetimes Collaboration +# SPDX-License-Identifier: MIT +# Based on the original by Simulating eXtreme Spacetimes Collaboration, +# licensed under MIT. All Changes are licensed under GPL-3.0-or-later. # # # Doxygen filter to format markdown math for Doxygen diff --git a/dumux/common/doubleexpintegrationconstants.hh b/dumux/common/doubleexpintegrationconstants.hh index eb969e4845..f53b416de9 100644 --- a/dumux/common/doubleexpintegrationconstants.hh +++ b/dumux/common/doubleexpintegrationconstants.hh @@ -1,5 +1,14 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: +// +// SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder +// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-FileCopyrightInfo: Copyright John D. Cook +// SPDX-License-Identifier: BSD-2-Clause +// Modified after the original version at +// https://www.codeproject.com/Articles/31550/Fast-Numerical-Integration licensed under +// BSD-2-Clause. All Changes are licensed under GPL-3.0-or-later. +// /***************************************************************************** * See the file COPYING for full copying permissions. * * * diff --git a/dumux/common/doubleexpintegrator.hh b/dumux/common/doubleexpintegrator.hh index 3591e82a01..5493698f4d 100644 --- a/dumux/common/doubleexpintegrator.hh +++ b/dumux/common/doubleexpintegrator.hh @@ -1,5 +1,14 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: +// +// SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder +// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-FileCopyrightInfo: Copyright John D. Cook +// SPDX-License-Identifier: BSD-2-Clause +// Modified after the original version at +// https://www.codeproject.com/Articles/31550/Fast-Numerical-Integration licensed under +// BSD-2-Clause. All Changes are licensed under GPL-3.0-or-later. +// /***************************************************************************** * See the file COPYING for full copying permissions. * * * diff --git a/dumux/io/format/fmt/README.rst b/dumux/io/format/fmt/README.rst index 152ce16eba..4c447f96c5 100644 --- a/dumux/io/format/fmt/README.rst +++ b/dumux/io/format/fmt/README.rst @@ -1,3 +1,7 @@ +:: + SPDX-FileCopyrightInfo: Copyright (c) 2012 - present, Victor Zverovich + SPDX-License-Identifier: LicenseRef-fmt + .. image:: https://user-images.githubusercontent.com/ 576385/156254208-f5b743a9-88cf-439d-b0c0-923d53e8d551.png :width: 25% diff --git a/dumux/io/format/fmt/VERSION.rst b/dumux/io/format/fmt/VERSION.rst index 47da986f86..9d0b8402f9 100644 --- a/dumux/io/format/fmt/VERSION.rst +++ b/dumux/io/format/fmt/VERSION.rst @@ -1 +1,5 @@ +:: + SPDX-FileCopyrightInfo: Copyright (c) 2012 - present, Victor Zverovich + SPDX-License-Identifier: LicenseRef-fmt + 9.1.0 diff --git a/dumux/io/format/fmt/core.h b/dumux/io/format/fmt/core.h index aa24b4cc44..16969a1bb7 100644 --- a/dumux/io/format/fmt/core.h +++ b/dumux/io/format/fmt/core.h @@ -1,3 +1,7 @@ +// +// SPDX-FileCopyrightInfo: Copyright (c) 2012 - present, Victor Zverovich +// SPDX-License-Identifier: LicenseRef-fmt +// // Formatting library for C++ - the core API for char/UTF-8 // // Copyright (c) 2012 - present, Victor Zverovich diff --git a/dumux/io/format/fmt/format-inl.h b/dumux/io/format/fmt/format-inl.h index 73c7feb99f..94689e07a9 100644 --- a/dumux/io/format/fmt/format-inl.h +++ b/dumux/io/format/fmt/format-inl.h @@ -1,3 +1,7 @@ +// +// SPDX-FileCopyrightInfo: Copyright (c) 2012 - 2016, Victor Zverovich +// SPDX-License-Identifier: LicenseRef-fmt +// // Formatting library for C++ - implementation // // Copyright (c) 2012 - 2016, Victor Zverovich diff --git a/dumux/io/format/fmt/format.cc b/dumux/io/format/fmt/format.cc index 76d287b617..95d367287e 100644 --- a/dumux/io/format/fmt/format.cc +++ b/dumux/io/format/fmt/format.cc @@ -1,3 +1,7 @@ +// +// SPDX-FileCopyrightInfo: Copyright (c) 2012 - 2016, Victor Zverovich +// SPDX-License-Identifier: LicenseRef-fmt +// // Formatting library for C++ // // Copyright (c) 2012 - 2016, Victor Zverovich diff --git a/dumux/io/format/fmt/format.h b/dumux/io/format/fmt/format.h index a40f92fe17..80fac4cee1 100644 --- a/dumux/io/format/fmt/format.h +++ b/dumux/io/format/fmt/format.h @@ -1,3 +1,7 @@ +// +// SPDX-FileCopyrightInfo: Copyright (c) 2012 - present, Victor Zverovich +// SPDX-License-Identifier: LicenseRef-fmt +// /* Formatting library for C++ diff --git a/dumux/io/format/fmt/ranges.h b/dumux/io/format/fmt/ranges.h index 886c3a414c..5535cd38fc 100644 --- a/dumux/io/format/fmt/ranges.h +++ b/dumux/io/format/fmt/ranges.h @@ -1,3 +1,8 @@ +// +// SPDX-FileCopyrightInfo: Copyright (c) 2012 - present, Victor Zverovich +// SPDX-FileCopyrightInfo: Copyright (c) 2018 - present, Remotion (Igor Schulz) +// SPDX-License-Identifier: LicenseRef-fmt +// // Formatting library for C++ - experimental range support // // Copyright (c) 2012 - present, Victor Zverovich diff --git a/dumux/io/xml/tinyxml2.cpp b/dumux/io/xml/tinyxml2.cpp index 215ffa59ef..c8b1186628 100644 --- a/dumux/io/xml/tinyxml2.cpp +++ b/dumux/io/xml/tinyxml2.cpp @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightInfo: Copyright (c) Lee Thomason +// SPDX-License-Identifier: Zlib /* Original code by Lee Thomason (www.grinninglizard.com) diff --git a/dumux/io/xml/tinyxml2.h b/dumux/io/xml/tinyxml2.h index e8ea49ec9a..6b3ee7c4d3 100644 --- a/dumux/io/xml/tinyxml2.h +++ b/dumux/io/xml/tinyxml2.h @@ -1,3 +1,7 @@ +// +// SPDX-FileCopyrightInfo: Copyright (c) Lee Thomason +// SPDX-License-Identifier: Zlib +// /* Original code by Lee Thomason (www.grinninglizard.com) -- GitLab