From 4e62d749b06e867669fe9c9b240487cfce0f2577 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 18 Nov 2019 10:21:22 -0800 Subject: [PATCH 1/2] Add include-copyright--source condition to more precisely describe bsl-1.0 and zlib --- README.md | 1 + _data/rules.yml | 3 +++ _licenses/bsl-1.0.txt | 2 +- _licenses/zlib.txt | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7b6b860..473e9b9 100644 --- a/README.md +++ b/README.md @@ -81,6 +81,7 @@ The license properties (rules) are stored as a bulleted list within the licenses #### Conditions * `include-copyright` - A copy of the license and copyright notice must be included with the software. +* `include-copyright--source` - A copy of the license and copyright notice must be included with the software in source form, but is not required for binaries. * `document-changes` - Changes made to the code must be documented. * `disclose-source` - Source code must be made available when the software is distributed. * `network-use-disclose` - Users who interact with the software via network are given the right to receive a copy of the source code. diff --git a/_data/rules.yml b/_data/rules.yml index 3a20f10..1f315b6 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -19,6 +19,9 @@ conditions: - description: A copy of the license and copyright notice must be included with the software. label: License and copyright notice tag: include-copyright +- description: A copy of the license and copyright notice must be included with the software in source form, but is not required for binaries. + label: License and copyright notice for source + tag: include-copyright--source - description: Changes made to the code must be documented. label: State changes tag: document-changes diff --git a/_licenses/bsl-1.0.txt b/_licenses/bsl-1.0.txt index e595a5c..ae37c9a 100644 --- a/_licenses/bsl-1.0.txt +++ b/_licenses/bsl-1.0.txt @@ -17,7 +17,7 @@ permissions: - private-use conditions: - - include-copyright + - include-copyright--source limitations: - liability diff --git a/_licenses/zlib.txt b/_licenses/zlib.txt index 0be8fd0..9ed25ed 100644 --- a/_licenses/zlib.txt +++ b/_licenses/zlib.txt @@ -15,7 +15,7 @@ permissions: - private-use conditions: - - include-copyright + - include-copyright--source - document-changes limitations: From 08ec1de7249a14cad57df0a7b268576e2c98434b Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 18 Nov 2019 10:32:39 -0800 Subject: [PATCH 2/2] Add BSL-1.0 and Zlib examples --- _licenses/bsl-1.0.txt | 3 +++ _licenses/zlib.txt | 3 +++ spec/license_meta_spec.rb | 4 +--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/_licenses/bsl-1.0.txt b/_licenses/bsl-1.0.txt index ae37c9a..8da7d01 100644 --- a/_licenses/bsl-1.0.txt +++ b/_licenses/bsl-1.0.txt @@ -9,6 +9,9 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of note: Boost recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the [Boost Software License FAQ](https://www.boost.org/users/license.html#FAQ). using: + - Boost: https://github.com/boostorg/boost/blob/master/LICENSE_1_0.txt + - Catch2: https://github.com/catchorg/Catch2/blob/master/LICENSE.txt + - DMD: https://github.com/dlang/dmd/blob/master/LICENSE.txt permissions: - commercial-use diff --git a/_licenses/zlib.txt b/_licenses/zlib.txt index 9ed25ed..706b1b5 100644 --- a/_licenses/zlib.txt +++ b/_licenses/zlib.txt @@ -7,6 +7,9 @@ description: A short permissive license, compatible with GPL. Requires altered s how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. using: + - GLFW: https://github.com/glfw/glfw/blob/master/LICENSE.md + - Portainer: https://github.com/portainer/portainer/blob/develop/LICENSE + - TinyXML-2: https://github.com/leethomason/tinyxml2/blob/master/LICENSE.txt permissions: - commercial-use diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index f5d58c6..02b7c8d 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -27,7 +27,6 @@ describe 'license meta' do 'agpl-3.0', 'artistic-2.0', 'bsd-3-clause-clear', - 'bsl-1.0', 'cc0-1.0', 'cc-by-4.0', 'cc-by-sa-4.0', @@ -38,8 +37,7 @@ describe 'license meta' do 'ms-pl', 'ms-rl', 'ofl-1.1', - 'wtfpl', - 'zlib' + 'wtfpl' ] skip 'added before 3 using examples required' if legacy.include?(license['slug']) expect(examples.length).to eq(3)