Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add more machine-readable data about the license #1274

Merged
merged 1 commit into from
Jan 6, 2017

Conversation

marado
Copy link
Contributor

@marado marado commented Nov 14, 2016

This small change is meant to make LibreJS happy.

Closes: #1273

This small change is meant to make LibreJS happy.

Closes: handlebars-lang#1273
@@ -22,8 +22,9 @@ module.exports = function(grunt) {
dist: {
options: {
processContent: function(content) {
return grunt.template.process('/**!\n\n @license\n <%= pkg.name %> v<%= pkg.version %>\n\n<%= grunt.file.read("LICENSE") %>\n*/\n')
+ content;
return grunt.template.process('/**!\n\n @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat\n <%= pkg.name %> v<%= pkg.version %>\n\n<%= grunt.file.read("LICENSE") %>\n*/\n')
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does this magical value come from?

@marado
Copy link
Contributor Author

marado commented Nov 23, 2016

Oops, yes, I should have said that...

It comes from https://www.gnu.org/software/librejs/free-your-javascript.html
.

On Nov 23, 2016 03:49, "Lon Ingram" [email protected] wrote:

@lawnsea commented on this pull request.

In Gruntfile.js
#1274 (review)
:

@@ -22,8 +22,9 @@ module.exports = function(grunt) {
dist: {
options: {
processContent: function(content) {

  •        return grunt.template.process('/*_!\n\n @license\n <%= pkg.name %> v<%= pkg.version %>\n\n<%= grunt.file.read("LICENSE") %>\n_/\n')
    
  •            + content;
    
  •        return grunt.template.process('/*_!\n\n @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat\n <%= pkg.name %> v<%= pkg.version %>\n\n<%= grunt.file.read("LICENSE") %>\n_/\n')
    

Where does this magical value come from?


You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#1274 (review),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AACBi7u1-sNqfn4LnQGjYOIfJBf0Uab-ks5rA7ezgaJpZM4Kxx5G
.

@lawnsea
Copy link
Collaborator

lawnsea commented Nov 23, 2016

@marado Ok, thanks. Do we also need /* @license-end */?

@marado
Copy link
Contributor Author

marado commented Nov 23, 2016

That's how I read the documentation, yes.

On Nov 23, 2016 15:21, "Lon Ingram" [email protected] wrote:

@marado https://github.com/marado Ok, thanks. Do we also need /*
@license-end */?


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#1274 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AACBi7nPQhPRzsVETx888HDjBdE4zyotks5rBFnogaJpZM4Kxx5G
.

@nknapp
Copy link
Collaborator

nknapp commented Jan 6, 2017

I just was a bit confused, because there is no explicit magnet-link for the MIT-license on the page on the libreJS-page. It just says:

Please note: When people speak of the "MIT license" they mean either the X11 license or the expat license. Please see which license the code uses, and label it accordingly.

But the expat-license is what's in Handlebars' LICENSE.md file, so everything is fine.

I would like to merge the PR. I would normally do 'squash and merge' or 'rebase and merge' but that would make me the author of the commit (I'm not sure with 'rebase and merge'). Could you rebase the branch onto of master so that I can merge it?

@marado
Copy link
Contributor Author

marado commented Jan 6, 2017

Since this is only one commit, there's nothing really to squash, and rebase and merge should not create a new commit (thus not crunching the authorship of the patch). So feel free to go ahead and 'rebase and merge'. If in any case github ends up munching the authorship, well, I won't loose any sleep over it either :-)

@nknapp nknapp merged commit a647673 into handlebars-lang:master Jan 6, 2017
@marado
Copy link
Contributor Author

marado commented Jan 6, 2017

BTW, the magnet links are on that page, check section 3.2.2.1 (List of magnet links for valid licenses).

@nknapp
Copy link
Collaborator

nknapp commented Jan 6, 2017

You're right. It's still yours.

Yes, the magnet links are on the page, yes, but there is no link for MIT, just for "expat" and "X11".
I just read "expat"-license for the first time, so I wanted to look.

@marado
Copy link
Contributor Author

marado commented Jan 6, 2017

Oh, I see.
"MIT License" doesn't really refer to one particular license: the term is used for several (slightly different) licenses, so the term 'expat' is used for the particular variant used in Handlebars.
More info, if you're curious: https://en.wikipedia.org/wiki/MIT_License#Variants

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants