Merge pull request #229 from catch22/spdx

[maint] SPDX license identifier on all core files
gnu-octave · Sep 22, 2019 · 72f632f · 72f632f
2 parents cc43585 + 6e98239
commit 72f632f
Show file tree

Hide file tree

Showing 19 changed files with 47 additions and 23 deletions.
diff --git a/Makefile b/Makefile
@@ -1,17 +1,21 @@
 SHELL   := /bin/bash
 
-## Copyright 2015 Oliver Heimlich
-## Copyright 2015 Michael Walter
-## Copyright 2015-2017, 2019 Colin B. Macdonald
-## Copyright 2016 Carnë Draug
-## Copyright 2019 Mike Miller
-## Copyright 2019 Andrew Janke
-## Copyright 2019 Manuel Leonhardt
-##
-## Copying and distribution of this file, with or without modification,
-## are permitted in any medium without royalty provided the copyright
-## notice and this notice are preserved.  This file is offered as-is,
-## without any warranty.
+# Maintainer makefile for Octave Doctest
+#
+# SPDX-License-Identifier: FSFAP
+#
+# Copyright 2015 Oliver Heimlich
+# Copyright 2015 Michael Walter
+# Copyright 2015-2017 Colin B. Macdonald
+# Copyright 2016 Carnë Draug
+# Copyright 2019 Mike Miller
+# Copyright 2019 Andrew Janke
+# Copyright 2019 Manuel Leonhardt
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
 
 TAR := $(shell which gtar 2>/dev/null || echo tar)
 

diff --git a/inst/doctest.m b/inst/doctest.m
@@ -1,6 +1,7 @@
 %% Copyright (c) 2010 Thomas Grenfell Smith
 %% Copyright (c) 2011, 2013-2016 Michael Walter
 %% Copyright (c) 2015-2019 Colin B. Macdonald
+%% SPDX-License-Identifier: BSD-3-Clause
 %%
 %% Redistribution and use in source and binary forms, with or without
 %% modification, are permitted provided that the following conditions are met:

diff --git a/inst/private/doctest_collect.m b/inst/private/doctest_collect.m
@@ -13,7 +13,7 @@
 % Copyright (c) 2015-2019 Colin B. Macdonald
 % Copyright (c) 2015 Oliver Heimlich
 % Copyright (C) 2018 Mike Miller
-% This is Free Software, BSD-3-Clause, see doctest.m for details.
+% SPDX-License-Identifier: BSD-3-Clause
 
 
 % TODO: methods('logical') octave/matlab differ: which behaviour do we want?

diff --git a/inst/private/doctest_colors.m b/inst/private/doctest_colors.m
@@ -6,7 +6,7 @@
 %%
 % Copyright (c) 2015 Michael Walter
 % Copyright (c) 2015, 2017 Colin B. Macdonald
-% This is Free Software, BSD-3-Clause, see doctest.m for details.
+% SPDX-License-Identifier: BSD-3-Clause
 
 
 % by default, no colors

diff --git a/inst/private/doctest_compare.m b/inst/private/doctest_compare.m
@@ -14,7 +14,7 @@
 % Copyright (c) 2010 Thomas Grenfell Smith
 % Copyright (c) 2015 Michael Walter
 % Copyright (c) 2015-2016 Colin B. Macdonald
-% This is Free Software, BSD-3-Clause, see doctest.m for details.
+% SPDX-License-Identifier: BSD-3-Clause
 
 
 % This looks bad, like hardcoding for lower-case "a href"

diff --git a/inst/private/doctest_datastore.m b/inst/private/doctest_datastore.m
@@ -8,9 +8,9 @@
 % See https://github.com/catch22/octave-doctest/issues/149 for discussion.
 
 %%
-% Copyright (c) 2017 Colin B. Macdonald
+% Copyright (c) 2017, 2019 Colin B. Macdonald
 % Copyright (c) 2017 Michael Walter
-% This is Free Software, BSD-3-Clause, see doctest.m for details.
+% SPDX-License-Identifier: BSD-3-Clause
 
 
 mlock();

diff --git a/inst/private/doctest_default_directives.m b/inst/private/doctest_default_directives.m
@@ -8,7 +8,7 @@
 
 %%
 % Copyright (c) 2015 Colin B. Macdonald
-% This is Free Software, BSD-3-Clause, see doctest.m for details.
+% SPDX-License-Identifier: BSD-3-Clause
 
 
   defaults.normalize_whitespace = true;

diff --git a/inst/private/doctest_format_exception.m b/inst/private/doctest_format_exception.m
@@ -9,7 +9,7 @@
 % Copyright (c) 2010 Thomas Grenfell Smith
 % Copyright (c) 2015, 2019 Colin B. Macdonald
 % Copyright (c) 2015, 2017 Michael Walter
-% This is Free Software, BSD-3-Clause, see doctest.m for details.
+% SPDX-License-Identifier: BSD-3-Clause
 
 
 % octave?

diff --git a/inst/private/doctest_join_conditions.m b/inst/private/doctest_join_conditions.m
@@ -8,7 +8,7 @@
 
 %%
 % Copyright (c) 2015, 2017 Michael Walter
-% This is Free Software, BSD-3-Clause, see doctest.m for details.
+% SPDX-License-Identifier: BSD-3-Clause
 
 
 if isempty(conditions)

diff --git a/inst/private/doctest_run_docstring.m b/inst/private/doctest_run_docstring.m
@@ -24,7 +24,7 @@
 % Copyright (c) 2010 Thomas Grenfell Smith
 % Copyright (c) 2011, 2015 Michael Walter
 % Copyright (c) 2015-2017, 2019 Colin B. Macdonald
-% License: BSD-3-Clause, see doctest.m for details
+% SPDX-License-Identifier: BSD-3-Clause
 
 
 % extract tests from docstring

diff --git a/inst/private/doctest_run_tests.m b/inst/private/doctest_run_tests.m
@@ -18,7 +18,7 @@
 % Copyright (c) 2010 Thomas Grenfell Smith
 % Copyright (c) 2011, 2015 Michael Walter
 % Copyright (c) 2015-2017, 2019 Colin B. Macdonald
-% License: BSD-3-Clause, see doctest.m for details
+% SPDX-License-Identifier: BSD-3-Clause
 
 
 % Implementation note: all internal variables should start with

diff --git a/inst/private/is_octave.m b/inst/private/is_octave.m
@@ -3,7 +3,7 @@
 
 %%
 % Copyright (c) 2015 Colin B. Macdonald
-% This is Free Software, BSD-3-Clause, see doctest.m for details.
+% SPDX-License-Identifier: BSD-3-Clause
 
 
 % Timings for different implementations, 10000 calls

diff --git a/octave-doctest.metainfo.xml b/octave-doctest.metainfo.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 Copyright 2016, 2019 Colin B. Macdonald
+SPDX-License-Identifier: FSFAP
 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright

diff --git a/test/bist.m b/test/bist.m
@@ -4,6 +4,9 @@ function bist()
 % Doctest mostly tests itself but in some cases we want to ensure
 % exactly what is being tested and yet we cannat call doctest recursively
 % https://github.com/catch22/octave-doctest/issues/184
+%
+% Copyright (c) 2019 Colin B. Macdonald
+% SPDX-License-Identifier: BSD-3-Clause
 
 end
 

diff --git a/test/test_angle_brackets.m b/test/test_angle_brackets.m
@@ -1,6 +1,9 @@
 function s = test_angle_brackets()
 % https://savannah.gnu.org/bugs/?45084 (Fixed in Octave 4.0)
 %
+% Copyright (c) 2015-2016 Colin B. Macdonald
+% SPDX-License-Identifier: BSD-3-Clause
+%
 % Fails on 3.8
 % >> oct38 = DOCTEST_OCTAVE && compare_versions(OCTAVE_VERSION, '4.0.0', '<');
 %

diff --git a/test/test_ans.m b/test/test_ans.m
@@ -1,3 +1,6 @@
+% Copyright (c) 2015 Colin B. Macdonald
+% SPDX-License-Identifier: BSD-3-Clause
+%
 % >> 4
 % ans =  4
 %

diff --git a/test/test_ans.texinfo b/test/test_ans.texinfo
@@ -1,3 +1,6 @@
+@c Copyright (c) 2015 Oliver Heimlich
+@c SPDX-License-Identifier: BSD-3-Clause
+
 @example
 >> 4
 ans =  4

diff --git a/test/test_blank_match.m b/test/test_blank_match.m
@@ -3,3 +3,8 @@
 %
 % >> a = 3 + 4;
 % ...
+%
+%
+% Copyright (c) 2015 Michael Walter
+% Copyright (c) 2015 Colin B. Macdonald
+% SPDX-License-Identifier: BSD-3-Clause
diff --git a/util/convert_comments.m b/util/convert_comments.m
@@ -1,4 +1,5 @@
 %% Copyright (c) 2015, 2017 Colin B. Macdonald
+%% SPDX-License-Identifier: BSD-3-Clause
 %%
 %% Redistribution and use in source and binary forms, with or without
 %% modification, are permitted provided that the following conditions are met: