From 377ae07e53c16709bd590d05ea995a6ef7b0509e Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Wed, 18 Mar 2020 11:42:27 -0500 Subject: [PATCH] xrt: Add missing SPDX tags --- .clang-tidy | 2 ++ .editorconfig | 3 +++ .gitignore | 3 +++ .gitlab-ci.yml | 3 +++ cmake/FindEGL.cmake | 1 + cmake/FindHIDAPI.cmake | 1 + cmake/FindLibcheck.cmake | 1 + cmake/FindLibusb1.cmake | 1 + cmake/FindOpenHMD.cmake | 1 + cmake/Findudev.cmake | 3 ++- doc/CHANGELOG.md | 5 +++++ src/xrt/.clang-format | 2 ++ src/xrt/state_trackers/dev/README.md | 6 +++++- src/xrt/targets/openxr/active_runtime.cmake | 1 + src/xrt/targets/openxr/install_active_runtime.sh | 5 +++++ src/xrt/targets/openxr/libopenxr.version | 5 +++++ src/xrt/targets/openxr/make_manifest.cmake | 2 ++ 17 files changed, 43 insertions(+), 2 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index b5e39349d..205eacfe0 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -1,4 +1,6 @@ --- +# SPDX-License-Identifier: CC0-1.0 +# SPDX-FileCopyrightText: 2018-2020 Collabora, Ltd. and the Monado contributors # Ideally we'd turn back on a few of these that are disabled near the end Checks: 'clang-diagnostic-*,clang-analyzer-*,performance-*,bugprone-*,cert-*,readability-*,misc-*,-modernize-*,-clang-analyzer-security.insecureAPI.strcpy,-bugprone-macro-parentheses,-readability-braces-around-statements,-misc-unused-parameters,-readability-implicit-bool-conversion,-clang-diagnostic-missing-field-initializers,-clang-diagnostic-missing-braces' WarningsAsErrors: '' diff --git a/.editorconfig b/.editorconfig index 23eb5e6b1..3ff654b59 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,6 +1,9 @@ # To use this config on you editor, follow the instructions at: # http://editorconfig.org +# SPDX-License-Identifier: CC0-1.0 +# SPDX-FileCopyrightText: 2018-2020 Collabora, Ltd. and the Monado contributors + root = true [*] diff --git a/.gitignore b/.gitignore index 88e074b09..34e5e822f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: CC0-1.0 +# SPDX-FileCopyrightText: 2018-2020 Collabora, Ltd. and the Monado contributors + # Ignore build products CMakeCache.txt CMakeLists.txt.user diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ea232de0..b543ddc72 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: CC0-1.0 +# SPDX-FileCopyrightText: 2018-2020 Collabora, Ltd. and the Monado contributors + variables: UPSTREAM_REPO: monado/monado diff --git a/cmake/FindEGL.cmake b/cmake/FindEGL.cmake index 955fee50f..160009277 100644 --- a/cmake/FindEGL.cmake +++ b/cmake/FindEGL.cmake @@ -32,6 +32,7 @@ # # Since pre-1.0.0. +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # Copyright 2014 Alex Merry # Copyright 2014 Martin Gräßlin diff --git a/cmake/FindHIDAPI.cmake b/cmake/FindHIDAPI.cmake index 228e839f7..3d0172878 100644 --- a/cmake/FindHIDAPI.cmake +++ b/cmake/FindHIDAPI.cmake @@ -45,6 +45,7 @@ # # Copyright Iowa State University 2009-2010. # Copyright Collabora, Ltd. 2019. +# SPDX-License-Identifier: BSL-1.0 # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) diff --git a/cmake/FindLibcheck.cmake b/cmake/FindLibcheck.cmake index 130acf8fe..4f908d5ec 100644 --- a/cmake/FindLibcheck.cmake +++ b/cmake/FindLibcheck.cmake @@ -1,4 +1,5 @@ # Copyright 2019 Collabora, Ltd. +# SPDX-License-Identifier: BSL-1.0 # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) diff --git a/cmake/FindLibusb1.cmake b/cmake/FindLibusb1.cmake index b161c81e0..f1c63e324 100644 --- a/cmake/FindLibusb1.cmake +++ b/cmake/FindLibusb1.cmake @@ -19,6 +19,7 @@ # Iowa State University HCI Graduate Program/VRAC # # Copyright Iowa State University 2009-2010. +# SPDX-License-Identifier: BSL-1.0 # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) diff --git a/cmake/FindOpenHMD.cmake b/cmake/FindOpenHMD.cmake index 1e109cf4e..09c8c8c1a 100644 --- a/cmake/FindOpenHMD.cmake +++ b/cmake/FindOpenHMD.cmake @@ -1,4 +1,5 @@ # Copyright 2019 Collabora, Ltd. +# SPDX-License-Identifier: BSL-1.0 # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) diff --git a/cmake/Findudev.cmake b/cmake/Findudev.cmake index ce454d576..235d7f141 100644 --- a/cmake/Findudev.cmake +++ b/cmake/Findudev.cmake @@ -14,7 +14,8 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2014 Kevin M. Godby +# Copyright 2014 Kevin M. Godby +# SPDX-License-Identifier: BSL-1.0 # # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index c8b064cdc..2957b4590 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog for Monado +```txt +SPDX-License-Identifier: CC0-1.0 +SPDX-FileCopyrightText: 2020 Collabora, Ltd. and the Monado contributors +``` + ## Monado 0.1.0 (2020-02-24) Initial (non-release) tag to promote/support packaging. diff --git a/src/xrt/.clang-format b/src/xrt/.clang-format index b7a2f02b6..474fc6876 100644 --- a/src/xrt/.clang-format +++ b/src/xrt/.clang-format @@ -1,4 +1,6 @@ --- +# SPDX-LicenseIdentifier: CC0-1.0 +# SPDX-FileCopyrightText: 2019, Collabora, Ltd. Language: Cpp BasedOnStyle: LLVM Standard: Auto diff --git a/src/xrt/state_trackers/dev/README.md b/src/xrt/state_trackers/dev/README.md index 7e20dee6a..8f68c0b4b 100644 --- a/src/xrt/state_trackers/dev/README.md +++ b/src/xrt/state_trackers/dev/README.md @@ -1,6 +1,10 @@ - # OpenXR device layer integrator +```txt +Copyright 2019, Collabora, Ltd. +SPDX-License-Identifier: BSL-1.0 +``` + This is where the device layer integrator code will go. It takes one or more xrt_device and plugs that into the OpenXR device layer interface, once the device layer has been finalized. diff --git a/src/xrt/targets/openxr/active_runtime.cmake b/src/xrt/targets/openxr/active_runtime.cmake index 03ba9b379..6a0e0dfe0 100644 --- a/src/xrt/targets/openxr/active_runtime.cmake +++ b/src/xrt/targets/openxr/active_runtime.cmake @@ -1,3 +1,4 @@ +# Copyright 2019, Benjamin Saunders # SPDX-License-Identifier: BSL-1.0 include(GNUInstallDirs) diff --git a/src/xrt/targets/openxr/install_active_runtime.sh b/src/xrt/targets/openxr/install_active_runtime.sh index 401b7f0c5..f9eb4c88b 100644 --- a/src/xrt/targets/openxr/install_active_runtime.sh +++ b/src/xrt/targets/openxr/install_active_runtime.sh @@ -1,4 +1,9 @@ #!/bin/sh -eux +# Copyright 2019, Drew DeVault +# SPDX-License-Identifier: BSL-1.0 +# +# Used by the Meson build only. + sysconfdir="$DESTDIR"/"$1" manifest="$2" xrversion="$3" diff --git a/src/xrt/targets/openxr/libopenxr.version b/src/xrt/targets/openxr/libopenxr.version index 1581ef8d3..078e1356e 100644 --- a/src/xrt/targets/openxr/libopenxr.version +++ b/src/xrt/targets/openxr/libopenxr.version @@ -1,3 +1,8 @@ +/* + * Copyright 2018-2020, Collabora, Ltd. + * SPDX-License-Identifier: BSL-1.0 + */ + OPENXR { global: xrNegotiateLoaderRuntimeInterface; # Only one exported symbol. local: *; # Hide everything else. diff --git a/src/xrt/targets/openxr/make_manifest.cmake b/src/xrt/targets/openxr/make_manifest.cmake index 268500718..34888a2af 100644 --- a/src/xrt/targets/openxr/make_manifest.cmake +++ b/src/xrt/targets/openxr/make_manifest.cmake @@ -1,3 +1,5 @@ +# Copyright 2019, Collabora, Ltd. +# Copyright 2019, Benjamin Saunders # SPDX-License-Identifier: BSL-1.0 # Get input from main CMake script