diff options
| -rw-r--r-- | REUSE.toml | 4 | ||||
| -rw-r--r-- | coin/module_config.yaml | 3 | ||||
| -rw-r--r-- | licenseRule.json | 17 |
3 files changed, 20 insertions, 4 deletions
@@ -22,14 +22,14 @@ SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." SPDX-License-Identifier = "BSD-3-Clause" [[annotations]] -path = ["**/doc/images/**", "examples/**"] +path = ["examples/**", "tests/manual/examples/**"] comment = "this must be after the build system table because example and snippets take precedence over build system" precedence = "closest" SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause" [[annotations]] -path = ["**/README*", "**.qdocconf", "src/serialport/doc/style/style.css"] +path = ["**/doc/images/**", "**/README*", "**.qdocconf", "src/serialport/doc/style/style.css"] comment = "documentation" precedence = "closest" SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." diff --git a/coin/module_config.yaml b/coin/module_config.yaml index aaf33238..b7fc6362 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -6,6 +6,9 @@ accept_configuration: instructions: Build: + - type: EnvironmentVariable + variableName: VERIFY_SOURCE_SBOM + variableValue: "ON" - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml" Test: diff --git a/licenseRule.json b/licenseRule.json index 36f81257..c07bdfb1 100644 --- a/licenseRule.json +++ b/licenseRule.json @@ -10,7 +10,9 @@ "Files with other endings can also be build system files" ], "file_pattern_ending" : ["CMakeLists.txt", ".cmake", ".pro", ".pri", ".prf", - "configure", "configure.bat", "cmake.in", "plist.in", "CMakeLists.txt.in"], + "configure", "configure.bat", "cmake.in", "plist.in", "CMakeLists.txt.in", + ".cmake.conf", ".gitattributes", ".gitignore", ".tag", ".yaml", "ci_config_linux.json", + "configure.json", ".cfg"], "location" : { "" : { "comment" : "Default", @@ -44,7 +46,8 @@ }, { "comment" : "Files with the following endings are Documentation licensed.", - "file_pattern_ending" : [".qdoc", ".qdocinc" , ".qdocconf", ".txt", "README", "qt_attribution.json"], + "file_pattern_ending" : [".qdoc", ".qdocinc" , ".qdocconf", "README", "qt_attribution.json", + "REUSE.toml", "licenseRule.json", ".css"], "location" :{ "" : { "comment" : "", @@ -64,6 +67,11 @@ "file type" : "module and plugin", "spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] }, + "dist/" : { + "comment" : "Default", + "file type" : "documentation", + "spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] + }, "src/" : { "comment" : "Default", "file type" : "module and plugin", @@ -78,6 +86,11 @@ "comment" : "Default", "file type" : "examples and snippets", "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + }, + ".*doc/images" : { + "comment" : "Default", + "file type" : "documentation", + "spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] } } } |