Closed
Bug 954114
Opened 10 years ago
Closed 10 years ago
Add license header to browserRequest.*
Categories
(Chat Core :: General, defect)
Chat Core
General
Tracking
(Not tracked)
RESOLVED
FIXED
0.3a2
People
(Reporter: clokep, Assigned: clokep)
References
Details
(Whiteboard: [0.3-blocking])
Attachments
(1 file, 2 obsolete files)
6.21 KB,
patch
|
florian
:
review+
|
Details | Diff | Splinter Review |
*** Original post on bio 679 at 2011-02-03 21:23:00 UTC *** +++ This bug was initially created as a clone of Bug #954112 (bio 677) +++ From bug 954035 (bio 598): browserRequest.js and browserRequest.xul are from the oauthorizer extension and currently do not have license headers. We've requested them from Shane Caraveo (mixedpuppy). The code is available at: https://github.com/mozilla/oauthorizer
Updated•10 years ago
|
Whiteboard: [0.3-blocking]
Assignee | ||
Comment 1•10 years ago
|
||
*** Original post on bio 679 as attmnt 546 at 2011-03-04 01:41:00 UTC *** I got mixedpuppy to add a license file to the repo: https://github.com/mozilla/oauthorizer/blob/master/LICENSE I simply put the boilerplate on the files though since it all links to the same license. (I add flo as a contributor, I believe that that's true since both files seem edited.)
Attachment #8352287 -
Flags: review?(florian)
Assignee | ||
Comment 2•10 years ago
|
||
*** Original post on bio 679 at 2011-03-04 01:47:36 UTC *** So, since this is incompatible, mixedpuppy said he'll tri-license. But not until tomorrow.
Comment 3•10 years ago
|
||
Comment on attachment 8352287 [details] [diff] [review] Add license headers *** Original change on bio 679 attmnt 546 at 2011-03-04 01:53:15 UTC *** - GPL and MPL are not compatible. - instantbird/theme/browserRequest.css needs a header too.
Attachment #8352287 -
Flags: review?(florian) → review-
Assignee | ||
Comment 4•10 years ago
|
||
*** Original post on bio 679 as attmnt 547 at 2011-03-04 01:57:00 UTC *** This needs to wait until the code is tri-licensed (hopefully tomorrow).
Assignee | ||
Comment 5•10 years ago
|
||
Comment on attachment 8352287 [details] [diff] [review] Add license headers *** Original change on bio 679 attmnt 546 at 2011-03-04 01:57:09 UTC was without comment, so any subsequent comment numbers will be shifted ***
Attachment #8352287 -
Attachment is obsolete: true
Comment 6•10 years ago
|
||
Comment on attachment 8352288 [details] [diff] [review] Add license headers *** Original change on bio 679 attmnt 547 at 2011-03-04 02:12:44 UTC *** Sorry for nitpicking, but this still doesn't look perfect :(. Using http://www.mozilla.org/MPL/boilerplate-1.1/ as a reference, and the experience of some other license headers I've seen used: >diff --git a/instantbird/content/browserRequest.js b/instantbird/content/browserRequest.js >--- a/instantbird/content/browserRequest.js >+++ b/instantbird/content/browserRequest.js >@@ -1,3 +1,39 @@ >+/* ***** BEGIN LICENSE BLOCK ***** >+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 >+ * >+ * The contents of this file are subject to the Mozilla Public License Version ... >+ * License. >+ * >+ * The Original Code is Mozilla Messaging. This is supposed to be "a short description of the code's function". I think it should include the name of the original add-on, so maybe "the oauthorizer add-on for Thunderbird". >+ * The Initial Developer of the Original Code is Shane Caraveo. There should be a line break after "is". >+ * Portions created by the Initial Developer are Copyright (C) 2010 >+ * the Initial Developer. All Rights Reserved. >+ * >+ * Contributor(s): >+ * Florian Queze "# Contributor names should be indented two spaces from the "Contributors:" line." Names of individuals should be followed by their email address.
Attachment #8352288 -
Flags: review-
Assignee | ||
Comment 7•10 years ago
|
||
*** Original post on bio 679 at 2011-03-04 15:35:26 UTC *** (In reply to comment #5) > (From update of attachment 8352288 [details] [diff] [review] (bio-attmnt 547) [details]) > Sorry for nitpicking, but this still doesn't look perfect :(. > Using http://www.mozilla.org/MPL/boilerplate-1.1/ as a reference, and the > experience of some other license headers I've seen used: > >diff --git a/instantbird/content/browserRequest.js b/instantbird/content/browserRequest.js > >--- a/instantbird/content/browserRequest.js > >+++ b/instantbird/content/browserRequest.js > >@@ -1,3 +1,39 @@ > >+/* ***** BEGIN LICENSE BLOCK ***** > >+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 > >+ * > >+ * The contents of this file are subject to the Mozilla Public License Version > ... > >+ * License. > >+ * > >+ * The Original Code is Mozilla Messaging. > This is supposed to be "a short description of the code's function". I think it > should include the name of the original add-on, so maybe "the oauthorizer > add-on for Thunderbird". mixedpuppy put "Mozilla Messaging" there on https://github.com/mozilla/oauthorizer/blob/master/LICENSE#L447 > >+ * The Initial Developer of the Original Code is Shane Caraveo. > There should be a line break after "is". I hate that line break, it's pointless. But I'll add it back in. > >+ * Portions created by the Initial Developer are Copyright (C) 2010 > >+ * the Initial Developer. All Rights Reserved. > >+ * > >+ * Contributor(s): > >+ * Florian Queze > "# Contributor names should be indented two spaces from the "Contributors:" > line." > Names of individuals should be followed by their email address. Ah, I did two spaces from the *, I could never remember what to do. Where did you find these guidelines anyway? I'll fix that and add an email. Waiting for him to come online again.
Comment 8•10 years ago
|
||
*** Original post on bio 679 at 2011-03-04 17:44:09 UTC *** (In reply to comment #6) > (In reply to comment #5) > > (From update of attachment 8352288 [details] [diff] [review] (bio-attmnt 547) [details] [details]) > > Sorry for nitpicking, but this still doesn't look perfect :(. > > Using http://www.mozilla.org/MPL/boilerplate-1.1/ as a reference, This is where I found the guidelines I quoted. > > >+ * The Original Code is Mozilla Messaging. > > This is supposed to be "a short description of the code's function". I think it > > should include the name of the original add-on, so maybe "the oauthorizer > > add-on for Thunderbird". > mixedpuppy put "Mozilla Messaging" there on > https://github.com/mozilla/oauthorizer/blob/master/LICENSE#L447 It doesn't matter much. The guidelines says "If uninspired, use "mozilla.org code.".". 'Mozilla Messaging code' seems acceptable. Whatever... > > >+ * The Initial Developer of the Original Code is Shane Caraveo. > > There should be a line break after "is". > I hate that line break, it's pointless. But I'll add it back in. I suspect it helps to parse the license headers. On Mozilla, they are used to automatically generate the list of copyright holders found in about:license. We currently don't parse our license headers for Instantbird, but we may need to do it when upgrading to MPL2 which has different (much shorter! :)) license headers. If we decide a switch to the MPL2 makes sense for us of course... > > >+ * Contributor(s): > > >+ * Florian Queze > > "# Contributor names should be indented two spaces from the "Contributors:" > > line." > > Names of individuals should be followed by their email address. > I'll fix that and add an email. Two emails (mine and mixedpuppy's) ;). Thanks for working on this by the way :).
Assignee | ||
Comment 9•10 years ago
|
||
*** Original post on bio 679 as attmnt 548 at 2011-03-05 14:16:00 UTC *** (In reply to comment #7) > (In reply to comment #6) > > (In reply to comment #5) > > > >+ * The Initial Developer of the Original Code is Shane Caraveo. > > > There should be a line break after "is". > > I hate that line break, it's pointless. But I'll add it back in. > > I suspect it helps to parse the license headers. On Mozilla, they are used to > automatically generate the list of copyright holders found in about:license. > > We currently don't parse our license headers for Instantbird, but we may need > to do it when upgrading to MPL2 which has different (much shorter! :)) license > headers. If we decide a switch to the MPL2 makes sense for us of course... Oh, I didn't realize people were parsing the header files! Makes sense than keeping a list of contributors though! Anyway I think this meets all your nits. (He also changed some of the description things, so I used what he has now -- "oauthorizer" and "Mozilla" with himself as a contributor.)
Attachment #8352289 -
Flags: review?(florian)
Assignee | ||
Comment 10•10 years ago
|
||
Comment on attachment 8352288 [details] [diff] [review] Add license headers *** Original change on bio 679 attmnt 547 at 2011-03-05 14:16:03 UTC was without comment, so any subsequent comment numbers will be shifted ***
Attachment #8352288 -
Attachment is obsolete: true
Comment 11•10 years ago
|
||
Comment on attachment 8352289 [details] [diff] [review] Add license headers *** Original change on bio 679 attmnt 548 at 2011-03-07 17:25:32 UTC was without comment, so any subsequent comment numbers will be shifted ***
Attachment #8352289 -
Flags: review?(florian) → review+
Comment 12•10 years ago
|
||
*** Original post on bio 679 at 2011-03-07 17:47:58 UTC *** Pushed as https://hg.instantbird.org/instantbird/rev/07d8cda33fa0 with 3 changes: - I removed the line break we discussed before, as on IRC you convinced me it was only there to avoid the >80 columns line. There are numerous examples of license headers without this line break in the code base. I misread the guidelines on this point, sorry. - I changed the encoding to UTF8, without this change the XML parser fails on the XUL file at the accentuated character in my name. - I moved the <?xml version="1.0"?> line at the top of the XUL file to avoid another XML parse error. Thanks for taking care of this uninteresting bug!
Status: ASSIGNED → RESOLVED
Closed: 10 years ago
Resolution: --- → FIXED
Target Milestone: --- → 0.3a2
You need to log in
before you can comment on or make changes to this bug.
Description
•