From 6583dd97d673adc62d55a477721bfebc651c0a30 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 1 Sep 2022 14:20:43 -0400 Subject: Adopt REUSE machine-readable licensing standard --- .clang-tidy | 3 ++ .gitignore | 3 ++ .reuse/dep5 | 9 ++++ INSTALL.md | 3 ++ LICENSES/CC0-1.0.txt | 121 +++++++++++++++++++++++++++++++++++++++++++++++ LICENSES/ISC.txt | 1 + NEWS | 3 +- README.md | 3 ++ doc/c/Doxyfile.in | 3 ++ doc/c/api/meson.build | 3 ++ doc/c/index.rst | 4 ++ doc/c/meson.build | 3 ++ doc/c/overview.rst | 4 ++ doc/c/reference.rst | 4 ++ doc/c/xml/meson.build | 3 ++ doc/conf.py.in | 3 ++ doc/meson.build | 3 ++ doc/summary.rst | 4 ++ include/.clang-tidy | 3 ++ include/sratom/sratom.h | 17 +------ meson.build | 3 ++ meson_options.txt | 3 ++ scripts/dox_to_sphinx.py | 13 +---- src/sratom.c | 17 +------ test/.clang-tidy | 3 ++ test/meson.build | 36 ++++++++++---- test/test_sratom.c | 17 +------ 27 files changed, 226 insertions(+), 66 deletions(-) create mode 100644 .reuse/dep5 create mode 100644 LICENSES/CC0-1.0.txt create mode 120000 LICENSES/ISC.txt diff --git a/.clang-tidy b/.clang-tidy index d075efd..bf47982 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -1,3 +1,6 @@ +# Copyright 2020-2022 David Robillard +# SPDX-License-Identifier: CC0-1.0 OR ISC + Checks: > *, -*-magic-numbers, diff --git a/.gitignore b/.gitignore index 467d5b5..097e2ac 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ +# Copyright 2019-2022 David Robillard +# SPDX-License-Identifier: CC0-1.0 OR ISC + build/** __pycache__ diff --git a/.reuse/dep5 b/.reuse/dep5 new file mode 100644 index 0000000..2e46a43 --- /dev/null +++ b/.reuse/dep5 @@ -0,0 +1,9 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: sratom +Upstream-Contact: David Robillard +Source: https://gitlab.com/drobilla/sratom + +Files: NEWS sratom.ttl +Copyright: 2012-2022 David Robillard +Comment: Contributed to the Commons as a representation of simple facts +License: CC0-1.0 OR ISC diff --git a/INSTALL.md b/INSTALL.md index 903e680..1ff7e2d 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,3 +1,6 @@ + + + Installation Instructions ========================= diff --git a/LICENSES/CC0-1.0.txt b/LICENSES/CC0-1.0.txt new file mode 100644 index 0000000..0e259d4 --- /dev/null +++ b/LICENSES/CC0-1.0.txt @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff --git a/LICENSES/ISC.txt b/LICENSES/ISC.txt new file mode 120000 index 0000000..012065c --- /dev/null +++ b/LICENSES/ISC.txt @@ -0,0 +1 @@ +../COPYING \ No newline at end of file diff --git a/NEWS b/NEWS index 76964f1..5593cba 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,9 @@ sratom (0.6.13) unstable; urgency=medium * Add project metadata + * Adopt REUSE machine-readable licensing standard - -- David Robillard Tue, 16 Aug 2022 00:35:13 +0000 + -- David Robillard Thu, 01 Sep 2022 18:20:58 +0000 sratom (0.6.12) stable; urgency=medium diff --git a/README.md b/README.md index 2a95f49..e4d444e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ + + + Sratom ====== diff --git a/doc/c/Doxyfile.in b/doc/c/Doxyfile.in index 9180f1f..bf42e8f 100644 --- a/doc/c/Doxyfile.in +++ b/doc/c/Doxyfile.in @@ -1,3 +1,6 @@ +# Copyright 2021-2022 David Robillard +# SPDX-License-Identifier: CC0-1.0 OR ISC + PROJECT_NAME = Sratom PROJECT_BRIEF = "A small library for serializing LV2 atoms" diff --git a/doc/c/api/meson.build b/doc/c/api/meson.build index 0ece07c..dfdad11 100644 --- a/doc/c/api/meson.build +++ b/doc/c/api/meson.build @@ -1,3 +1,6 @@ +# Copyright 2021-2022 David Robillard +# SPDX-License-Identifier: CC0-1.0 OR ISC + c_sratom_rst = custom_target( 'sratom.rst', command: [dox_to_sphinx, '-f', '@INPUT0@', '@OUTDIR@'], diff --git a/doc/c/index.rst b/doc/c/index.rst index 2e02d5d..4c7e619 100644 --- a/doc/c/index.rst +++ b/doc/c/index.rst @@ -1,3 +1,7 @@ +.. + Copyright 2020-2021 David Robillard + SPDX-License-Identifier: ISC + ###### Sratom ###### diff --git a/doc/c/meson.build b/doc/c/meson.build index 8ed81c0..1742601 100644 --- a/doc/c/meson.build +++ b/doc/c/meson.build @@ -1,3 +1,6 @@ +# Copyright 2021-2022 David Robillard +# SPDX-License-Identifier: CC0-1.0 OR ISC + config = configuration_data() config.set('SRATOM_VERSION', meson.project_version()) diff --git a/doc/c/overview.rst b/doc/c/overview.rst index 3b26a5b..4884839 100644 --- a/doc/c/overview.rst +++ b/doc/c/overview.rst @@ -1,3 +1,7 @@ +.. + Copyright 2020-2021 David Robillard + SPDX-License-Identifier: ISC + ######## Overview ######## diff --git a/doc/c/reference.rst b/doc/c/reference.rst index 9164d6b..5deb127 100644 --- a/doc/c/reference.rst +++ b/doc/c/reference.rst @@ -1,3 +1,7 @@ +.. + Copyright 2020-2021 David Robillard + SPDX-License-Identifier: ISC + ############# API Reference ############# diff --git a/doc/c/xml/meson.build b/doc/c/xml/meson.build index eaa6bcc..7832ff6 100644 --- a/doc/c/xml/meson.build +++ b/doc/c/xml/meson.build @@ -1,3 +1,6 @@ +# Copyright 2021-2022 David Robillard +# SPDX-License-Identifier: CC0-1.0 OR ISC + doxygen = find_program('doxygen') config = configuration_data() diff --git a/doc/conf.py.in b/doc/conf.py.in index f3aee92..1dbf9fc 100644 --- a/doc/conf.py.in +++ b/doc/conf.py.in @@ -1,3 +1,6 @@ +# Copyright 2020-2022 David Robillard +# SPDX-License-Identifier: ISC + # Project information project = "Sratom" diff --git a/doc/meson.build b/doc/meson.build index 46fc3bb..93bcaf4 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -1,3 +1,6 @@ +# Copyright 2021-2022 David Robillard +# SPDX-License-Identifier: CC0-1.0 OR ISC + docdir = get_option('datadir') / 'doc' doxygen = find_program('doxygen', required: get_option('docs')) diff --git a/doc/summary.rst b/doc/summary.rst index 94279ce..84714ba 100644 --- a/doc/summary.rst +++ b/doc/summary.rst @@ -1,3 +1,7 @@ +.. + Copyright 2020-2021 David Robillard + SPDX-License-Identifier: ISC + Sratom is a small library for serializing `LV2 atoms`_. Sratom reads/writes atoms from/to RDF, allowing them to be converted between binary and text or stored in a model. diff --git a/include/.clang-tidy b/include/.clang-tidy index a01dfba..4ff4048 100644 --- a/include/.clang-tidy +++ b/include/.clang-tidy @@ -1,3 +1,6 @@ +# Copyright 2020-2022 David Robillard +# SPDX-License-Identifier: CC0-1.0 OR ISC + Checks: > *, -clang-diagnostic-unused-macros, diff --git a/include/sratom/sratom.h b/include/sratom/sratom.h index 077adff..3fd053e 100644 --- a/include/sratom/sratom.h +++ b/include/sratom/sratom.h @@ -1,18 +1,5 @@ -/* - Copyright 2012-2021 David Robillard - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ +// Copyright 2012-2021 David Robillard +// SPDX-License-Identifier: ISC /// @file sratom.h Public API for Sratom diff --git a/meson.build b/meson.build index e837661..99583fd 100644 --- a/meson.build +++ b/meson.build @@ -1,3 +1,6 @@ +# Copyright 2021-2022 David Robillard +# SPDX-License-Identifier: CC0-1.0 OR ISC + project('sratom', ['c'], version: '0.6.13', license: 'ISC', diff --git a/meson_options.txt b/meson_options.txt index 8ec1821..fc6692e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,6 @@ +# Copyright 2021-2022 David Robillard +# SPDX-License-Identifier: CC0-1.0 OR ISC + option('docs', type: 'feature', value: 'auto', yield: true, description: 'Build documentation') diff --git a/scripts/dox_to_sphinx.py b/scripts/dox_to_sphinx.py index c9d401c..06cfbdb 100755 --- a/scripts/dox_to_sphinx.py +++ b/scripts/dox_to_sphinx.py @@ -1,18 +1,7 @@ #!/usr/bin/env python3 # Copyright 2020 David Robillard -# -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# SPDX-License-Identifier: ISC """ Write Sphinx markup from Doxygen XML. diff --git a/src/sratom.c b/src/sratom.c index 323acf7..b834313 100644 --- a/src/sratom.c +++ b/src/sratom.c @@ -1,18 +1,5 @@ -/* - Copyright 2012-2021 David Robillard - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ +// Copyright 2012-2021 David Robillard +// SPDX-License-Identifier: ISC #include "sratom/sratom.h" diff --git a/test/.clang-tidy b/test/.clang-tidy index 30cb10f..683e359 100644 --- a/test/.clang-tidy +++ b/test/.clang-tidy @@ -1,3 +1,6 @@ +# Copyright 2020-2022 David Robillard +# SPDX-License-Identifier: CC0-1.0 OR ISC + Checks: > *, -*-magic-numbers, diff --git a/test/meson.build b/test/meson.build index e7a2a9f..593308e 100644 --- a/test/meson.build +++ b/test/meson.build @@ -1,3 +1,31 @@ +# Copyright 2021-2022 David Robillard +# SPDX-License-Identifier: CC0-1.0 OR ISC + +#################### +# Project Metadata # +#################### + + +# Check release metadata +if not meson.is_subproject() and get_option('strict') + autoship = find_program('autoship', required: false) + if autoship.found() + test('autoship', autoship, args: ['test', sratom_src_root], suite: 'data') + endif +endif + +# Check licensing metadata +reuse = find_program('reuse', required: false) +if reuse.found() + test('REUSE', reuse, + args: ['--root', sratom_src_root, 'lint'], + suite: 'data') +endif + +############## +# Unit Tests # +############## + unit_tests = [ 'sratom', ] @@ -15,11 +43,3 @@ foreach unit : unit_tests suite: 'unit', ) endforeach - -if not meson.is_subproject() and get_option('strict') - # Check release metadata - autoship = find_program('autoship', required: false) - if autoship.found() - test('autoship', autoship, args: ['test', sratom_src_root], suite: 'data') - endif -endif diff --git a/test/test_sratom.c b/test/test_sratom.c index cc56d8f..246b5c5 100644 --- a/test/test_sratom.c +++ b/test/test_sratom.c @@ -1,18 +1,5 @@ -/* - Copyright 2012-2016 David Robillard - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ +// Copyright 2012-2016 David Robillard +// SPDX-License-Identifier: ISC #include "lv2/atom/atom.h" #include "lv2/atom/forge.h" -- cgit v1.2.1