From 05aca23980d8581599bac46500574d23c507203c Mon Sep 17 00:00:00 2001 From: Simon Spannagel <simon.spannagel@cern.ch> Date: Tue, 24 Jan 2023 10:07:03 +0100 Subject: [PATCH] Add licenses for some util files --- .gitignore | 3 +++ CMakeLists.txt | 3 +++ CONTRIBUTING.md | 6 ++++++ README.md | 5 +++++ cmake/CPackConfig.cmake | 3 +++ cmake/compiler-flag-checks.cmake | 3 +++ cmake/corryvreckan.cmake | 3 +++ cmake/setup.cmake.sh | 3 +++ cmake/tools.cmake | 3 +++ etc/README.md | 5 +++++ etc/addModule.sh | 3 +++ etc/docker/Dockerfile | 3 +++ etc/docker/Dockerfile.deps | 3 +++ etc/setup_lxplus.sh | 3 +++ src/core/CMakeLists.txt | 3 +++ src/exec/CMakeLists.txt | 3 +++ src/exec/corry.cpp | 1 + src/objects/CMakeLists.txt | 3 +++ src/tools/cuts.h | 1 + src/tools/kdtree.h | 1 + 20 files changed, 61 insertions(+) diff --git a/.gitignore b/.gitignore index 6d7cc5f7b..c9d70e527 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2016-2022 CERN and the Corryvreckan authors +# SPDX-License-Identifier: CC0-1.0 + # ignore build and install directories build/ bin/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 76863dc86..1732d42cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2017-2023 CERN and the Corryvreckan authors +# SPDX-License-Identifier: MIT + # CMake file for the Corryvreckan framework CMAKE_MINIMUM_REQUIRED(VERSION 3.4.3 FATAL_ERROR) IF(COMMAND CMAKE_POLICY) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1f7ecbf1b..2a318f779 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,3 +1,9 @@ +--- +# SPDX-FileCopyrightText: 2017-2023 CERN and the Corryvreckan authors +# SPDX-License-Identifier: CC-BY-4.0 +title: "How to contribute" +--- + # How to contribute Thanks for considering to contribute to Corryvreckan. Any type of merge request, ranging from small bugfixes, improvements to the documentation to entirely new functionality, is much appreciated. We, the maintainers, will try to our best to look carefully at every merge request. diff --git a/README.md b/README.md index 7a1ec6191..598c699ac 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ +<!-- +SPDX-FileCopyrightText: 2017-2023 CERN and the Corryvreckan authors +SPDX-License-Identifier: CC-BY-4.0 +--> +  # Corryvreckan diff --git a/cmake/CPackConfig.cmake b/cmake/CPackConfig.cmake index e38014e33..980500978 100644 --- a/cmake/CPackConfig.cmake +++ b/cmake/CPackConfig.cmake @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2017-2023 CERN and the Corryvreckan authors +# SPDX-License-Identifier: MIT + # Packaging configuration SET(CPACK_PACKAGE_NAME "corryvreckan") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The Maelstrom for Your Test Beam Data") diff --git a/cmake/compiler-flag-checks.cmake b/cmake/compiler-flag-checks.cmake index c9cc11779..d4baa950f 100644 --- a/cmake/compiler-flag-checks.cmake +++ b/cmake/compiler-flag-checks.cmake @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2017-2023 CERN and the Corryvreckan authors +# SPDX-License-Identifier: MIT + # Check for supported flags and remove unsupported warnings INCLUDE(CheckCXXCompilerFlag) FOREACH( FLAG ${COMPILER_FLAGS} ) diff --git a/cmake/corryvreckan.cmake b/cmake/corryvreckan.cmake index 68e74c7ee..93e65e9cd 100644 --- a/cmake/corryvreckan.cmake +++ b/cmake/corryvreckan.cmake @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2017-2023 CERN and the Corryvreckan authors +# SPDX-License-Identifier: MIT + # For every module, build a separate library to be loaded by corryvreckan core MACRO(corryvreckan_enable_default val) # Get the name of the module diff --git a/cmake/setup.cmake.sh b/cmake/setup.cmake.sh index 60180bf5f..df493d016 100644 --- a/cmake/setup.cmake.sh +++ b/cmake/setup.cmake.sh @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2017-2023 CERN and the Corryvreckan authors +# SPDX-License-Identifier: MIT + Corryvreckan_version="@CORRYVRECKAN_VERSION@" # Dependencies diff --git a/cmake/tools.cmake b/cmake/tools.cmake index ccef1b412..ac7c27e2d 100644 --- a/cmake/tools.cmake +++ b/cmake/tools.cmake @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2017-2023 CERN and the Corryvreckan authors +# SPDX-License-Identifier: MIT + # Retrieve the project version string from git describe FUNCTION(get_version PROJECT_VERSION) # Check if this is a source tarball build diff --git a/etc/README.md b/etc/README.md index 418a718a4..21a871c93 100644 --- a/etc/README.md +++ b/etc/README.md @@ -1,3 +1,8 @@ +<!-- +SPDX-FileCopyrightText: 2017-2023 CERN and the Corryvreckan authors +SPDX-License-Identifier: CC-BY-4.0 +--> + # Scripts ## addModule.sh diff --git a/etc/addModule.sh b/etc/addModule.sh index 3c9c0d4ea..fd153cf9b 100755 --- a/etc/addModule.sh +++ b/etc/addModule.sh @@ -1,5 +1,8 @@ #!/bin/bash +# SPDX-FileCopyrightText: 2017-2023 CERN and the Corryvreckan authors +# SPDX-License-Identifier: MIT + echo -e "\nPreparing code basis for a new module:\n" # Ask for module name: diff --git a/etc/docker/Dockerfile b/etc/docker/Dockerfile index e1f5d988c..64333ab83 100644 --- a/etc/docker/Dockerfile +++ b/etc/docker/Dockerfile @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2018-2023 CERN and the Corryvreckan authors +# SPDX-License-Identifier: MIT + FROM gitlab-registry.cern.ch/corryvreckan/corryvreckan/corryvreckan-deps:latest MAINTAINER Simon Spannagel <simon.spannagel@cern.ch> diff --git a/etc/docker/Dockerfile.deps b/etc/docker/Dockerfile.deps index a890904d0..9399c22ac 100644 --- a/etc/docker/Dockerfile.deps +++ b/etc/docker/Dockerfile.deps @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2018-2023 CERN and the Corryvreckan authors +# SPDX-License-Identifier: MIT + FROM ubuntu:latest MAINTAINER Simon Spannagel <simon.spannagel@cern.ch> diff --git a/etc/setup_lxplus.sh b/etc/setup_lxplus.sh index 02cd84678..b3e4af4f1 100644 --- a/etc/setup_lxplus.sh +++ b/etc/setup_lxplus.sh @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2017-2023 CERN and the Corryvreckan authors +# SPDX-License-Identifier: MIT + if [ ! -d "/cvmfs/clicdp.cern.ch" ]; then echo "CVMFS not available" return diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 65312146b..aaa4a6e40 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2017-2022 CERN and the Corryvreckan authors +# SPDX-License-Identifier: MIT + # Include the dependencies INCLUDE_DIRECTORIES(SYSTEM ${CORRYVRECKAN_DEPS_INCLUDE_DIRS}) diff --git a/src/exec/CMakeLists.txt b/src/exec/CMakeLists.txt index c4c7d95e6..7a8475a83 100644 --- a/src/exec/CMakeLists.txt +++ b/src/exec/CMakeLists.txt @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2017-2022 CERN and the Corryvreckan authors +# SPDX-License-Identifier: MIT + # include dependencies INCLUDE_DIRECTORIES(SYSTEM ${CORRYVRECKAN_DEPS_INCLUDE_DIRS}) diff --git a/src/exec/corry.cpp b/src/exec/corry.cpp index 90a647887..2d2508ce2 100644 --- a/src/exec/corry.cpp +++ b/src/exec/corry.cpp @@ -6,6 +6,7 @@ * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md". * In applying this license, CERN does not waive the privileges and immunities granted to it by virtue of its status as an * Intergovernmental Organization or submit itself to any jurisdiction. + * SPDX-License-Identifier: MIT */ #include <atomic> diff --git a/src/objects/CMakeLists.txt b/src/objects/CMakeLists.txt index a8464406c..71e156aa1 100644 --- a/src/objects/CMakeLists.txt +++ b/src/objects/CMakeLists.txt @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2017-2022 CERN and the Corryvreckan authors +# SPDX-License-Identifier: MIT + # Include the standard dependencies INCLUDE_DIRECTORIES(SYSTEM ${CORRYVRECKAN_DEPS_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(SYSTEM ${GBL_INCLUDE_DIRS}) diff --git a/src/tools/cuts.h b/src/tools/cuts.h index 02296a9c6..dd7591bf4 100644 --- a/src/tools/cuts.h +++ b/src/tools/cuts.h @@ -6,6 +6,7 @@ * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md". * In applying this license, CERN does not waive the privileges and immunities granted to it by virtue of its status as an * Intergovernmental Organization or submit itself to any jurisdiction. + * SPDX-License-Identifier: MIT */ #ifndef CORRYVRECKAN_CUTS_H diff --git a/src/tools/kdtree.h b/src/tools/kdtree.h index 2b796d94e..0a9924bfd 100644 --- a/src/tools/kdtree.h +++ b/src/tools/kdtree.h @@ -6,6 +6,7 @@ * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md". * In applying this license, CERN does not waive the privileges and immunities granted to it by virtue of its status as an * Intergovernmental Organization or submit itself to any jurisdiction. + * SPDX-License-Identifier: MIT */ #ifndef CORRYVRECKAN_KDTREE__H -- GitLab