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.

Sign up for GitHub

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

Jump to bottom

Re-license under MPL2. Fixes Issue #39. #96

Closed
wants to merge 4 commits into from
Closed

Re-license under MPL2. Fixes Issue #39. #96

wants to merge 4 commits into from

Conversation

xabolcs
Copy link
Collaborator

@xabolcs xabolcs commented Sep 30, 2012

Relicense log:

re-license section

$ relic -v -r extension/

extension/chrome.manifest
... no license found, skipping this file
extension/install.rdf
... no license found, skipping this file
extension/platform/WINNT_x86_64-msvc/crashme.dll
... binary, skipping this file
extension/platform/WINNT_x86_64-msvc/accessory.dll
... binary, skipping this file
extension/platform/Darwin_ppc-gcc3/libcrashme.dylib
... binary, skipping this file
extension/platform/WINNT_x86-msvc/crashme.dll
... binary, skipping this file
extension/platform/WINNT_x86-msvc/accessory.dll
... binary, skipping this file
extension/platform/Linux_x86_64-gcc3/libcrashme.so
... binary, skipping this file
extension/platform/Linux_x86-gcc3/libcrashme.so
... binary, skipping this file
extension/platform/Darwin_x86_64-gcc3/libcrashme.dylib
... binary, skipping this file
extension/platform/Linux_arm-eabi-gcc3/libcrashme.so
... binary, skipping this file
extension/platform/Darwin_x86-gcc3/libcrashme.dylib
... binary, skipping this file
extension/modules/Crasher.jsm
... hpnd found (not tri-license, so doing nothing)
extension/modules/Logging.jsm
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/modules/Logging.jsm'
extension/chrome/skin/browser.css
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/skin/browser.css'
extension/chrome/skin/options/options.css
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/skin/options/options.css'
extension/chrome/skin/session/session.css
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/skin/session/session.css'
extension/chrome/skin/screenshot/screenshot.css
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/skin/screenshot/screenshot.css'
extension/chrome/skin/aboutNightly/aboutNightly.css
... no license found, skipping this file
extension/chrome/skin/aboutNightly/aboutNightly-sb.css
... no license found, skipping this file
extension/chrome/locale/en-US/customize.dtd
... no license found, skipping this file
extension/chrome/locale/en-US/screenshot.dtd
... no license found, skipping this file
extension/chrome/locale/en-US/variables.properties
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/locale/en-US/variables.properties'
extension/chrome/locale/en-US/nightly.properties
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/locale/en-US/nightly.properties'
extension/chrome/locale/en-US/nightly.dtd
... no license found, skipping this file
extension/chrome/locale/en-US/screenshot.properties
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/locale/en-US/screenshot.properties'
extension/chrome/content/browser.js
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/content/browser.js'
extension/chrome/content/suiteOverlay.xul
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/content/suiteOverlay.xul'
extension/chrome/content/messengerOverlay.xul
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/content/messengerOverlay.xul'
extension/chrome/content/browserOverlay.xul
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/content/browserOverlay.xul'
extension/chrome/content/platform.js
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/content/platform.js'
extension/chrome/content/winPlatform.js
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/content/winPlatform.js'
extension/chrome/content/crashme.js
... hpnd found (not tri-license, so doing nothing)
extension/chrome/content/pprint.js
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/content/pprint.js'
extension/chrome/content/suite.js
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/content/suite.js'
extension/chrome/content/songbird.js
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/content/songbird.js'
extension/chrome/content/songbirdOverlay.xul
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/content/songbirdOverlay.xul'
extension/chrome/content/nightly.js
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/content/nightly.js'
extension/chrome/content/messenger.js
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/content/messenger.js'
extension/chrome/content/titlebar/customize.xul
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/content/titlebar/customize.xul'
extension/chrome/content/titlebar/customize.js
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/content/titlebar/customize.js'
extension/chrome/content/screenshot/screenshot.xul
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/content/screenshot/screenshot.xul'
extension/chrome/content/screenshot/multipartFormData.js
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/content/screenshot/multipartFormData.js'
extension/chrome/content/screenshot/providers.js
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/content/screenshot/providers.js'
extension/chrome/content/screenshot/screenshot.js
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/content/screenshot/screenshot.js'
extension/chrome/content/aboutNightly/aboutNightly.js
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/content/aboutNightly/aboutNightly.js'
extension/chrome/content/aboutNightly/aboutNightly.xhtml
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/chrome/content/aboutNightly/aboutNightly.xhtml'
extension/defaults/preferences/nightlytools.js
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/defaults/preferences/nightlytools.js'
extension/defaults/preferences/variables.js
... block_begin/mpl/gpl/lgpl/block_end found, need to relicense
... done relicensing 'extension/defaults/preferences/variables.js'
extension/components/aboutNightly.js
... no license found, skipping this file

and the adding section

relic -v -A extension/
extension/chrome.manifest
... not adding license to .manifest files
extension/install.rdf
... no license found, need to add one
comment delims were none: ['<!--', '-', '-->']
... done adding license to 'extension/install.rdf'
extension/platform/WINNT_x86_64-msvc/crashme.dll
... binary, skipping this file
extension/platform/WINNT_x86_64-msvc/accessory.dll
... binary, skipping this file
extension/platform/Darwin_ppc-gcc3/libcrashme.dylib
... binary, skipping this file
extension/platform/WINNT_x86-msvc/crashme.dll
... binary, skipping this file
extension/platform/WINNT_x86-msvc/accessory.dll
... binary, skipping this file
extension/platform/Linux_x86_64-gcc3/libcrashme.so
... binary, skipping this file
extension/platform/Linux_x86-gcc3/libcrashme.so
... binary, skipping this file
extension/platform/Darwin_x86_64-gcc3/libcrashme.dylib
... binary, skipping this file
extension/platform/Linux_arm-eabi-gcc3/libcrashme.so
... binary, skipping this file
extension/platform/Darwin_x86-gcc3/libcrashme.dylib
... binary, skipping this file
extension/modules/Crasher.jsm
... license found, skipping this file
extension/modules/Logging.jsm
... license found, skipping this file
extension/chrome/skin/browser.css
... license found, skipping this file
extension/chrome/skin/options/options.css
... license found, skipping this file
extension/chrome/skin/session/session.css
... license found, skipping this file
extension/chrome/skin/screenshot/screenshot.css
... license found, skipping this file
extension/chrome/skin/aboutNightly/aboutNightly.css
... no license found, need to add one
... empty, skipping this file
extension/chrome/skin/aboutNightly/aboutNightly-sb.css
... no license found, need to add one
comment delims were none: ['/*', '*', '*/']
... done adding license to 'extension/chrome/skin/aboutNightly/aboutNightly-sb.css'
extension/chrome/locale/en-US/customize.dtd
... no license found, need to add one
comment delims were none: ['<!--', '-', '-->']
... done adding license to 'extension/chrome/locale/en-US/customize.dtd'
extension/chrome/locale/en-US/screenshot.dtd
... no license found, need to add one
comment delims were none: ['<!--', '-', '-->']
... done adding license to 'extension/chrome/locale/en-US/screenshot.dtd'
extension/chrome/locale/en-US/variables.properties
... license found, skipping this file
extension/chrome/locale/en-US/nightly.properties
... license found, skipping this file
extension/chrome/locale/en-US/nightly.dtd
... no license found, need to add one
comment delims were none: ['<!--', '-', '-->']
... done adding license to 'extension/chrome/locale/en-US/nightly.dtd'
extension/chrome/locale/en-US/screenshot.properties
... license found, skipping this file
extension/chrome/content/browser.js
... license found, skipping this file
extension/chrome/content/suiteOverlay.xul
... license found, skipping this file
extension/chrome/content/messengerOverlay.xul
... license found, skipping this file
extension/chrome/content/browserOverlay.xul
... license found, skipping this file
extension/chrome/content/platform.js
... license found, skipping this file
extension/chrome/content/winPlatform.js
... license found, skipping this file
extension/chrome/content/crashme.js
... license found, skipping this file
extension/chrome/content/pprint.js
... license found, skipping this file
extension/chrome/content/suite.js
... license found, skipping this file
extension/chrome/content/songbird.js
... license found, skipping this file
extension/chrome/content/songbirdOverlay.xul
... license found, skipping this file
extension/chrome/content/nightly.js
... license found, skipping this file
extension/chrome/content/messenger.js
... license found, skipping this file
extension/chrome/content/titlebar/customize.xul
... license found, skipping this file
extension/chrome/content/titlebar/customize.js
... license found, skipping this file
extension/chrome/content/screenshot/screenshot.xul
... license found, skipping this file
extension/chrome/content/screenshot/multipartFormData.js
... license found, skipping this file
extension/chrome/content/screenshot/providers.js
... license found, skipping this file
extension/chrome/content/screenshot/screenshot.js
... license found, skipping this file
extension/chrome/content/aboutNightly/aboutNightly.js
... license found, skipping this file
extension/chrome/content/aboutNightly/aboutNightly.xhtml
... license found, skipping this file
extension/defaults/preferences/nightlytools.js
... license found, skipping this file
extension/defaults/preferences/variables.js
... license found, skipping this file
extension/components/aboutNightly.js
... no license found, need to add one
comment delims were none: ['/*', '*', '*/']
... done adding license to 'extension/components/aboutNightly.js'
extension/components/disableCompatibility-bootstrap.jsm
... license found, skipping this file
extension/components/nttAddonCompatibilityService.js
... license found, skipping this file

--------------------- Summary of Results ------------------------
Files skipped b/c they are binary: 10
Files skipped b/c they already had a license: 34
Files skipped b/c they had an extension we aren't relicensing: 1
Files skipped b/c they were empty: 1
Files skipped b/c of other weirdness: 0
Total files analysed: 52
Files to which a license was added: 6
-----------------------------------------------------------------

As You noticed chrome.manifest was excluded due to ... not adding license to .manifest files

@xabolcs xabolcs mentioned this pull request Oct 2, 2012
Closed
@xabolcs
Copy link
Collaborator Author

xabolcs commented Oct 2, 2012

extension/components/nttAddonCompatibilityService.js was left out. :(
And also extension/LICENSE should be upgraded!

@xabolcs
Issue mozilla#39 - part 2:
cd538eb 
- move license to the top
@xabolcs
Issue mozilla#39 - part 2:
131f00d 
- add license to forgotten files
@xabolcs
Copy link
Collaborator Author

xabolcs commented Oct 2, 2012

xabolcs commented:

... also extension/LICENSE ...

Modified to point to MPL v. 2.0.
Should I include instead of linking it?

Text version could be imported from https://www.mozilla.org/MPL/2.0/index.txt.

@xabolcs
Issue mozilla#39 - part 2:
028195e 
- modified LICENSE file
@xabolcs
Copy link
Collaborator Author

xabolcs commented Oct 2, 2012

@whimboo: pull updated, feel free to review (& land if r+). :)

@xabolcs xabolcs mentioned this pull request Oct 11, 2012
Closed
xabolcs added a commit that referenced this pull request Oct 17, 2012
@xabolcs @whimboo
Re-license under MPL2 (#96)
1e3675e
@whimboo
Copy link
Contributor

whimboo commented Oct 17, 2012

39 files changed, 273 insertions(+), 1274 deletions(-) \o/ (that's wonderful)

@whimboo whimboo closed this Oct 17, 2012
@whimboo
Copy link
Contributor

whimboo commented Oct 17, 2012

1e3675e

@xabolcs xabolcs mentioned this pull request Oct 19, 2012
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@xabolcs @whimboo