Finish adding SPDX tags and setup a reuse checked in Github Actions CI

2024-11-09 13:50:05 +00:00 · 2021-05-08 01:47:48 -07:00 · 2021-05-08 01:47:48 -07:00 · f2a65545b8
commit f2a65545b8
parent 2ceca64004
43 changed files with 71 additions and 51 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -1,3 +1,6 @@
+# Copyright 2020-2021 The Khronos Group, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
 name: CI

 on:
@ -51,4 +54,15 @@ jobs:
        shell: bash
        working-directory: ${{github.workspace}}/build
        run: ctest --verbose -C Release
+  reuse:
+    name: "REUSE license check"
+    runs-on: ubuntu-latest
+    container: khronosgroup/docker-images:asciidoctor-spec
+
+    steps:
+      # REUSE license checker
+      - name: license-check
+        run: |
+          reuse lint
+

--- a/.reuse/dep5
+++ b/.reuse/dep5
@ -5,3 +5,7 @@ Source: https://github.com/KhronosGroup/SPIRV-Cross
 Files: shaders*/* reference/* tests-other/*
 Copyright: 2016-2021 The Khronos Group, Inc.
 License: Apache-2.0
+
+Files: spirv.h spirv.hpp
+Copyright: 2016-2021 The Khronos Group, Inc.
+License: MIT
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,4 +1,5 @@
 # Copyright 2016-2021 Google Inc.
+# SPDX-License-Identifier: Apache-2.0 OR MIT
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@ -16,7 +17,6 @@
 # At your option, you may choose to accept this material under either:
 #  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 #  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
-# SPDX-License-Identifier: Apache-2.0 OR MIT.
 #

 cmake_minimum_required(VERSION 3.0)
--- a/GLSL.std.450.h
+++ b/GLSL.std.450.h
@ -1,27 +1,10 @@
 /*
-** Copyright (c) 2014-2016 The Khronos Group Inc.
-**
-** Permission is hereby granted, free of charge, to any person obtaining a copy
-** of this software and/or associated documentation files (the "Materials"),
-** to deal in the Materials without restriction, including without limitation
-** the rights to use, copy, modify, merge, publish, distribute, sublicense,
-** and/or sell copies of the Materials, and to permit persons to whom the
-** Materials are furnished to do so, subject to the following conditions:
-**
-** The above copyright notice and this permission notice shall be included in
-** all copies or substantial portions of the Materials.
-**
-** MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
-** STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
-** HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/ 
-**
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-** OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-** THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-** FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS
-** IN THE MATERIALS.
+ * Copyright 2014-2016,2021 The Khronos Group, Inc.
+ * SPDX-License-Identifier: MIT
+ *
+ * MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
+ * STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
+ * HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
 */

 #ifndef GLSLstd450_H
--- a/README.md
+++ b/README.md
@ -1,3 +1,8 @@
+<!--
+    Copyright 2020-2021 The Khronos Group, Inc.
+    SPDX-License-Identifier: CC-BY-4.0
+-->
+
 # SPIRV-Cross

 SPIRV-Cross is a tool designed for parsing and converting SPIR-V to other shader languages.
--- a/gn/BUILD.gn
+++ b/gn/BUILD.gn
@ -1,4 +1,5 @@
 # Copyright (C) 2019 Google, Inc.
+# SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@ -39,7 +40,7 @@ source_set("spirv_cross_sources") {
    "../spirv_glsl.cpp",
    "../spirv_glsl.hpp",
    "../spirv_hlsl.cpp",
-    "../spirv_hlsl.hpp",    
+    "../spirv_hlsl.hpp",
    "../spirv_msl.cpp",
    "../spirv_msl.hpp",
    "../spirv_parser.cpp",
--- a/include/spirv_cross/barrier.hpp
+++ b/include/spirv_cross/barrier.hpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2015-2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/include/spirv_cross/external_interface.h
+++ b/include/spirv_cross/external_interface.h
@ -1,5 +1,6 @@
 /*
 * Copyright 2015-2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/include/spirv_cross/image.hpp
+++ b/include/spirv_cross/image.hpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2015-2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/include/spirv_cross/internal_interface.hpp
+++ b/include/spirv_cross/internal_interface.hpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2015-2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/include/spirv_cross/sampler.hpp
+++ b/include/spirv_cross/sampler.hpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2015-2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/include/spirv_cross/thread_group.hpp
+++ b/include/spirv_cross/thread_group.hpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2015-2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/main.cpp
+++ b/main.cpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2015-2021 Arm Limited
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #include "spirv_cpp.hpp"
--- a/pkg-config/spirv-cross-c-shared.pc.in
+++ b/pkg-config/spirv-cross-c-shared.pc.in
@ -1,3 +1,6 @@
+# Copyright 2020-2021 Hans-Kristian Arntzen
+# SPDX-License-Identifier: Apache-2.0
+
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
 libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
--- a/samples/cpp/atomics.cpp
+++ b/samples/cpp/atomics.cpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2015-2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/samples/cpp/multiply.cpp
+++ b/samples/cpp/multiply.cpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2015-2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/samples/cpp/shared.cpp
+++ b/samples/cpp/shared.cpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2015-2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/spirv_cfg.cpp
+++ b/spirv_cfg.cpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2016-2021 Arm Limited
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #include "spirv_cfg.hpp"
--- a/spirv_cfg.hpp
+++ b/spirv_cfg.hpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2016-2021 Arm Limited
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #ifndef SPIRV_CROSS_CFG_HPP
--- a/spirv_common.hpp
+++ b/spirv_common.hpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2015-2021 Arm Limited
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #ifndef SPIRV_CROSS_COMMON_HPP
--- a/spirv_cpp.cpp
+++ b/spirv_cpp.cpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2015-2021 Arm Limited
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #include "spirv_cpp.hpp"
--- a/spirv_cpp.hpp
+++ b/spirv_cpp.hpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2015-2021 Arm Limited
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #ifndef SPIRV_CROSS_CPP_HPP
--- a/spirv_cross.cpp
+++ b/spirv_cross.cpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2015-2021 Arm Limited
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #include "spirv_cross.hpp"
--- a/spirv_cross.hpp
+++ b/spirv_cross.hpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2015-2021 Arm Limited
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #ifndef SPIRV_CROSS_HPP
--- a/spirv_cross_c.cpp
+++ b/spirv_cross_c.cpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2019-2021 Hans-Kristian Arntzen
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #include "spirv_cross_c.h"
--- a/spirv_cross_c.h
+++ b/spirv_cross_c.h
@ -1,5 +1,6 @@
 /*
 * Copyright 2019-2021 Hans-Kristian Arntzen
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #ifndef SPIRV_CROSS_C_API_H
--- a/spirv_cross_containers.hpp
+++ b/spirv_cross_containers.hpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2019-2021 Hans-Kristian Arntzen
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #ifndef SPIRV_CROSS_CONTAINERS_HPP
--- a/spirv_cross_error_handling.hpp
+++ b/spirv_cross_error_handling.hpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2015-2021 Arm Limited
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #ifndef SPIRV_CROSS_ERROR_HANDLING
--- a/spirv_cross_parsed_ir.cpp
+++ b/spirv_cross_parsed_ir.cpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2018-2021 Arm Limited
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #include "spirv_cross_parsed_ir.hpp"
--- a/spirv_cross_parsed_ir.hpp
+++ b/spirv_cross_parsed_ir.hpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2018-2021 Arm Limited
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #ifndef SPIRV_CROSS_PARSED_IR_HPP
--- a/spirv_cross_util.cpp
+++ b/spirv_cross_util.cpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2015-2021 Arm Limited
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #include "spirv_cross_util.hpp"
--- a/spirv_cross_util.hpp
+++ b/spirv_cross_util.hpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2015-2021 Arm Limited
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #ifndef SPIRV_CROSS_UTIL_HPP
--- a/spirv_glsl.cpp
+++ b/spirv_glsl.cpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2015-2021 Arm Limited
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #include "spirv_glsl.hpp"
--- a/spirv_glsl.hpp
+++ b/spirv_glsl.hpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2015-2021 Arm Limited
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #ifndef SPIRV_CROSS_GLSL_HPP
--- a/spirv_hlsl.cpp
+++ b/spirv_hlsl.cpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2016-2021 Robert Konrad
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -19,7 +20,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #include "spirv_hlsl.hpp"
--- a/spirv_hlsl.hpp
+++ b/spirv_hlsl.hpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2016-2021 Robert Konrad
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #ifndef SPIRV_HLSL_HPP
--- a/spirv_msl.cpp
+++ b/spirv_msl.cpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2016-2021 The Brenwill Workshop Ltd.
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #include "spirv_msl.hpp"
--- a/spirv_msl.hpp
+++ b/spirv_msl.hpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2016-2021 The Brenwill Workshop Ltd.
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #ifndef SPIRV_CROSS_MSL_HPP
--- a/spirv_parser.cpp
+++ b/spirv_parser.cpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2018-2021 Arm Limited
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #include "spirv_parser.hpp"
--- a/spirv_parser.hpp
+++ b/spirv_parser.hpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2018-2021 Arm Limited
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #ifndef SPIRV_CROSS_PARSER_HPP
--- a/spirv_reflect.cpp
+++ b/spirv_reflect.cpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2018-2021 Bradley Austin Davis
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #include "spirv_reflect.hpp"
--- a/spirv_reflect.hpp
+++ b/spirv_reflect.hpp
@ -1,5 +1,6 @@
 /*
 * Copyright 2018-2021 Bradley Austin Davis
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,7 +19,6 @@
 * At your option, you may choose to accept this material under either:
 *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
 *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- * SPDX-License-Identifier: Apache-2.0 OR MIT.
 */

 #ifndef SPIRV_CROSS_REFLECT_HPP
--- a/test_shaders.py
+++ b/test_shaders.py
@ -1,6 +1,7 @@
 #!/usr/bin/env python3

 # Copyright 2015-2021 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.