From 6ae1f697d76db394a33fe4cfcddea76c80c7c51a Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 19 Feb 2017 14:37:32 -0800 Subject: [PATCH 1/3] same-license--variations --- _data/rules.yml | 9 +++++++++ _licenses/epl-1.0.txt | 2 +- _licenses/lgpl-2.1.txt | 2 +- _licenses/lgpl-3.0.txt | 2 +- _licenses/mpl-2.0.txt | 2 +- _licenses/ms-rl.txt | 2 +- appendix.md | 22 ++++++++++++---------- 7 files changed, 26 insertions(+), 15 deletions(-) diff --git a/_data/rules.yml b/_data/rules.yml index f1be24a..57400b6 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -31,6 +31,15 @@ conditions: - description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. label: Same License tag: same-license +- description: Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used. + label: Same License (File) + tag: same-license--file +- description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library. + label: Same License (Library) + tag: same-license--library +- description: Modifications must be released under the same license when distributing the software in source form. + label: Same License (Source) + tag: same-license--source limitations: - description: This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights. diff --git a/_licenses/epl-1.0.txt b/_licenses/epl-1.0.txt index 80712e9..5a5b6c4 100644 --- a/_licenses/epl-1.0.txt +++ b/_licenses/epl-1.0.txt @@ -24,7 +24,7 @@ permissions: conditions: - disclose-source - include-copyright - - same-license + - same-license--source limitations: - liability diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.txt index 7dbfc2a..d1224d0 100644 --- a/_licenses/lgpl-2.1.txt +++ b/_licenses/lgpl-2.1.txt @@ -22,7 +22,7 @@ conditions: - include-copyright - disclose-source - document-changes - - same-license + - same-license--library limitations: - liability diff --git a/_licenses/lgpl-3.0.txt b/_licenses/lgpl-3.0.txt index b7fd1dd..cea10cb 100644 --- a/_licenses/lgpl-3.0.txt +++ b/_licenses/lgpl-3.0.txt @@ -23,7 +23,7 @@ conditions: - include-copyright - disclose-source - document-changes - - same-license + - same-license--library limitations: - liability diff --git a/_licenses/mpl-2.0.txt b/_licenses/mpl-2.0.txt index ec461ce..7da98da 100644 --- a/_licenses/mpl-2.0.txt +++ b/_licenses/mpl-2.0.txt @@ -26,7 +26,7 @@ permissions: conditions: - disclose-source - include-copyright - - same-license + - same-license--file limitations: - liability diff --git a/_licenses/ms-rl.txt b/_licenses/ms-rl.txt index db4fb67..18ab1ca 100644 --- a/_licenses/ms-rl.txt +++ b/_licenses/ms-rl.txt @@ -17,7 +17,7 @@ permissions: conditions: - disclose-source - include-copyright - - same-license + - same-license--file limitations: - warranty diff --git a/appendix.md b/appendix.md index a28f3be..316c6bd 100644 --- a/appendix.md +++ b/appendix.md @@ -17,7 +17,7 @@ If you're here to choose a license, **[start from the home page](/)** to see a f {% for type in types %} {% assign rules = site.data.rules[type] | sort: "label" %} {% for rule_obj in rules %} - {% if seen_tags contains rule_obj.tag %} + {% if seen_tags contains rule_obj.tag or rule_obj.tag contains '--' %} {% continue %} {% endif %} {% capture seen_tags %}{{ seen_tags | append:rule_obj.tag }}{% endcapture %} @@ -33,20 +33,22 @@ If you're here to choose a license, **[start from the home page](/)** to see a f {% assign rules = site.data.rules[type] | sort: "label" %} {% for rule_obj in rules %} {% assign req = rule_obj.tag %} - {% if seen_tags contains req %} + {% if seen_tags contains req or rule_obj.tag contains '--' %} {% continue %} {% endif %} {% capture seen_tags %}{{ seen_tags | append:req }}{% endcapture %} {% assign seen_req = false %} {% for t in types %} - {% if license[t] contains req %} - - - - - - {% assign seen_req = true %} - {% endif %} + {% for r in license[t] %} + {% if r contains req %} + + + + + + {% assign seen_req = true %} + {% endif %} + {% endfor %} {% endfor %} {% unless seen_req %} From b240450ca97dd807bf88f893e1b32b1ac8c969d7 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 19 Feb 2017 14:59:25 -0800 Subject: [PATCH 2/3] add same-license-- variations to README --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index ab072bb..6b7f7e9 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,9 @@ The license properties (rules) are stored as a bulleted list within the licenses * `disclose-source` - Source code must be made available when distributing the software. * `network-use-disclose` - Users who interact with the software via network are given the right to receive a copy of the corresponding source code. * `same-license` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. +* `same-license--file` - Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used. +* `same-license--library` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library. +* `same-license--source` - Modifications must be released under the same license when distributing the software in source form. #### Limitations From 1ce6e03c5e531cc2d94d0df5c5e097783f9e228d Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 19 Feb 2017 17:31:58 -0800 Subject: [PATCH 3/3] simplify --- README.md | 1 - _data/rules.yml | 3 --- _licenses/epl-1.0.txt | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index 6b7f7e9..96069a4 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,6 @@ The license properties (rules) are stored as a bulleted list within the licenses * `same-license` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. * `same-license--file` - Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used. * `same-license--library` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library. -* `same-license--source` - Modifications must be released under the same license when distributing the software in source form. #### Limitations diff --git a/_data/rules.yml b/_data/rules.yml index 57400b6..ce36cce 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -37,9 +37,6 @@ conditions: - description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library. label: Same License (Library) tag: same-license--library -- description: Modifications must be released under the same license when distributing the software in source form. - label: Same License (Source) - tag: same-license--source limitations: - description: This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights. diff --git a/_licenses/epl-1.0.txt b/_licenses/epl-1.0.txt index 5a5b6c4..80712e9 100644 --- a/_licenses/epl-1.0.txt +++ b/_licenses/epl-1.0.txt @@ -24,7 +24,7 @@ permissions: conditions: - disclose-source - include-copyright - - same-license--source + - same-license limitations: - liability