Merge pull request #2 from DSD-DBS/fix/licenses

Fix licenses
DSD-DBS · Aug 9, 2023 · c962992 · c962992
2 parents 6f96b76 + 2c2030a
commit c962992
Show file tree

Hide file tree

Showing 10 changed files with 96 additions and 135 deletions.
diff --git a/.clang-format b/.clang-format
@@ -1,4 +1,7 @@
 ---
+# SPDX-FileCopyrightText: Copyright DB Netz AG
+# SPDX-License-Identifier: CC0-1.0
+
 Language: Cpp
 AccessModifierOffset: -4
 AlignAfterOpenBracket: DontAlign

diff --git a/.clang-tidy b/.clang-tidy
@@ -1,4 +1,7 @@
 ---
+# SPDX-FileCopyrightText: Copyright DB Netz AG
+# SPDX-License-Identifier: CC0-1.0
+
 # google-readability-avoid-underscore-in-googletest-name: The rationale behind this is explained in the GTest FAQ. Basically, it avoids illegal or duplicated names created by GTest based on the inputs to TEST_F.
 # -readability-function-size, -readability-function-cognitive-complexity: Disabled because our functions are too complex at the moment and refactoring needs to be done separately.
 # -modernize-concat-nested-namespaces: We don't actually use C++17 yet, so we need to disable C++17 fixes.

diff --git a/.cmake-format.py b/.cmake-format.py
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: Copyright DB Netz AG
+# SPDX-License-Identifier: Apache-2.0
+
 # ----------------------------------
 # Options affecting listfile parsing
 # ----------------------------------

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,7 +1,7 @@
+---
 # SPDX-FileCopyrightText: Copyright DB Netz AG
 # SPDX-License-Identifier: CC0-1.0
 
----
 name: Rail Horizon CI
 
 on:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,16 +1,83 @@
+---
 # SPDX-FileCopyrightText: Copyright DB Netz AG
 # SPDX-License-Identifier: CC0-1.0
 
----
 repos:
+    - repo: https://github.com/Lucas-C/pre-commit-hooks
+      rev: v1.5.1
+      hooks:
+          - id: insert-license
+            name: Insert license headers (Markdown)
+            args:
+                - --detect-license-in-X-top-lines=15
+                - --license-filepath
+                - LICENSES/.license_header_cc0.txt
+                - --comment-style
+                - <!--| ~| -->
+            types_or: [markdown]
+            files: ''
+          - id: insert-license
+            name: Insert license headers (XML)
+            args:
+                - --detect-license-in-X-top-lines=15
+                - --license-filepath
+                - LICENSES/.license_header_cc0.txt
+                - --insert-license-after-regex
+                - ^<\?xml.*\?>
+                - --comment-style
+                - <!--| ~| -->
+            types_or: [xml]
+            files: ''
+          - id: insert-license
+            name: Insert license headers (C, C++)
+            args:
+                - --detect-license-in-X-top-lines=15
+                - --license-filepath
+                - LICENSES/.license_header.txt
+                - --comment-style
+                - /*| *| */
+            types_or: [c, c++]
+            files: ''
+          - id: insert-license
+            name: Insert license headers (Python)
+            args:
+                - --detect-license-in-X-top-lines=15
+                - --license-filepath
+                - LICENSES/.license_header.txt
+                - --comment-style
+                - '#'
+            types_or: [python]
+            files: ''
+          - id: insert-license
+            name: Insert license headers (CMake, Shell)
+            args:
+                - --detect-license-in-X-top-lines=15
+                - --license-filepath
+                - LICENSES/.license_header_cc0.txt
+                - --comment-style
+                - '#'
+            types_or: [gitmodules, gitignore, cmake, shell]
+            files: ''
+          - id: insert-license
+            name: Insert license headers (YAML)
+            args:
+                - --detect-license-in-X-top-lines=15
+                - --license-filepath
+                - LICENSES/.license_header_cc0.txt
+                - --insert-license-after-regex
+                - ^---$
+                - --comment-style
+                - '#'
+            types_or: [yaml]
+            files: ''
     - repo: https://github.com/pre-commit/pre-commit-hooks
-      rev: v4.0.1
+      rev: v4.4.0
       hooks:
           - id: mixed-line-ending
             args: [--fix=lf]
           - id: trailing-whitespace
     - repo: https://github.com/jumanjihouse/pre-commit-hook-yamlfmt
-      rev: 0.2.2
+      rev: 0.2.3
       hooks:
           - id: yamlfmt
     - repo: https://github.com/pre-commit/mirrors-yapf
@@ -35,49 +102,6 @@ repos:
     # verbose: true
           - id: cmake-lint
             exclude: CPM.cmake
-    - repo: https://github.com/Lucas-C/pre-commit-hooks
-      rev: v1.4.2
-      hooks:
-          - id: insert-license
-            name: Insert license headers (shell-style comments)
-            files: (?:^|/)(?:.*\.(?:sh|toml|ya?ml|cmake)|\.((?:git|helm|docker)(ignore|modules)|.clang-format|Doxyfile.in)|CMakeLists.txt)$
-            # exclude: '(?:^|/)\..+|^docs/Makefile$'
-            args:
-                - --detect-license-in-X-top-lines=15
-                - --license-filepath
-                - LICENSES/.license_header_cc0.txt
-                - --comment-style
-                - '#'
-          - id: insert-license
-            name: Insert license headers (XML-style comments)
-            files: \.(?:html|md|xml)$
-            exclude: (?:^|/)\..+
-            args:
-                - --detect-license-in-X-top-lines=15
-                - --license-filepath
-                - LICENSES/.license_header_cc0.txt
-                - --comment-style
-                - <!--| ~| -->
-          - id: insert-license
-            name: Insert license headers (C-style comments)
-            files: \.(?:cpp|h|proto)$
-            exclude: (?:^|/)\..+
-            args:
-                - --detect-license-in-X-top-lines=15
-                - --license-filepath
-                - LICENSES/.license_header.txt
-                - --comment-style
-                - /*| *| */
-          - id: insert-license
-            name: Insert license headers (C-style comments)
-            files: \.(?:py)$
-            exclude: (?:^|/)\..+
-            args:
-                - --detect-license-in-X-top-lines=15
-                - --license-filepath
-                - LICENSES/.license_header.txt
-                - --comment-style
-                - '#'
     - repo: local
       hooks:
           - id: include-what-you-use

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/src/dsd_map_service_ros_wrapper/package.xml b/src/dsd_map_service_ros_wrapper/package.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0"?>
+<!--
+ ~ SPDX-FileCopyrightText: Copyright DB Netz AG
+ ~ SPDX-License-Identifier: CC0-1.0
+ -->
+
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>dsd_map_service_ros_wrapper</name>

diff --git a/src/dsd_rail_horizon/config/parameters.yaml b/src/dsd_rail_horizon/config/parameters.yaml
@@ -1,7 +1,7 @@
+---
 # SPDX-FileCopyrightText: Copyright DB Netz AG
 # SPDX-License-Identifier: CC0-1.0
 
----
 rail_horizon_publisher:
     ros__parameters:
         rail_horizon_namespace: /rail_horizon/

diff --git a/src/dsd_rail_horizon/package.xml b/src/dsd_rail_horizon/package.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0"?>
+<!--
+ ~ SPDX-FileCopyrightText: Copyright DB Netz AG
+ ~ SPDX-License-Identifier: CC0-1.0
+ -->
+
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>dsd_rail_horizon</name>

diff --git a/src/dsd_rail_horizon_core/package.xml b/src/dsd_rail_horizon_core/package.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0"?>
+<!--
+ ~ SPDX-FileCopyrightText: Copyright DB Netz AG
+ ~ SPDX-License-Identifier: CC0-1.0
+ -->
+
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>dsd_rail_horizon_core</name>