1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 04:40:09 +01:00

Merge pull request #698 from github/bin-no-by

Add include-copyright--source condition to more precisely describe bsl-1.0 and zlib
This commit is contained in:
Mike Linksvayer 2019-11-22 12:37:39 -08:00 committed by GitHub
commit 5c6737b47c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 5 deletions

View File

@ -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.

View File

@ -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

View File

@ -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
@ -17,7 +20,7 @@ permissions:
- private-use
conditions:
- include-copyright
- include-copyright--source
limitations:
- liability

View File

@ -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
@ -15,7 +18,7 @@ permissions:
- private-use
conditions:
- include-copyright
- include-copyright--source
- document-changes
limitations:

View File

@ -27,15 +27,13 @@ describe 'license meta' do
'agpl-3.0',
'artistic-2.0',
'bsd-3-clause-clear',
'bsl-1.0',
'eupl-1.1',
'lgpl-2.1',
'lgpl-3.0',
'lppl-1.3c',
'ms-pl',
'ms-rl',
'wtfpl',
'zlib'
'wtfpl'
]
skip 'added before 3 using examples required' if legacy.include?(license['slug'])
expect(examples.length).to eq(3)