760009 - MPL 2 upgrade: comm-central (cleanup)

Status: RESOLVED FIXED

(mozilla.org :: Licensing, task)

Description

[Gervase Markham [:gerv]]

We have upgraded most of comm-central in bug 757018; this bug is for dealing with any mistakes or missed files.

Gerv

Comment 1

[Gervase Markham [:gerv]]

Florian writes in bug 759808:
> There's a comment at the top of [installer/windows/nsis/updater_append.ini] stating that 
> it's important that this file starts with a line break, and this file is used to append it 
> to another file that already has a license header, so I think we don't want the header here. 
> The file exists for other Mozilla applications in mozilla-central and comm-central, and I 
> think you will want to revert the change to these files.

Gerv

Comment 2

[Gervase Markham [:gerv]]

Florian also writes:

> instantbird/themes/accounts-aero.css
> instantbird/themes/blist-aero.css
> instantbird/themes/conversation-aero.css
> instantbird/themes/instantbird-aero.css
> instantbird/themes/tabbrowser-winstripe/tabbrowser-aero.css
>  These css files start by %include'ing their non -aero version, so adding
> the license header in them with a /* */ comment format would duplicate the
> header in the resulting files. I think it's good to add a license header to
> these files, but it should be with a "% " prefix, so that the headers are
> preprocessed out. The same situation exists on comm-central.

Gerv

Comment 3

[Gervase Markham [:gerv]]

See also bug 759816.

Gerv

Comment 4

[Philip Chee]

Discovered in Bug 794777 Comment 3:
http://mxr.mozilla.org/comm-central/source/suite/branding/nightly/icons/svg/README#8

Comment 5

[Gervase Markham [:gerv]]

Comment 4 fix:
https://hg.mozilla.org/comm-central/rev/544cc63da917

Gerv

Comment 6

[Gervase Markham [:gerv]]

File new bugs for any additional problems.

Gerv

Comment 7

[Florian Quèze [:florian]]

Has comment 2 here already been addressed?

Comment 8

[Gervase Markham [:gerv]]

Ah. Probably not :-)

Gerv

Comment 9

[Gervase Markham [:gerv]]

:florian: I can't find the files listed in comment 2 in a current checkout of comm-central. Can you check whether they still exist and, if so, tell me where they are?

Thanks,

Gerv

Comment 10

[Florian Quèze [:florian]]

(In reply to Gervase Markham [:gerv] from comment #9)
> Can you check whether they still exist and, if so, tell me
> where they are?

They exist both in comm-central and mozilla-central:
http://mxr.mozilla.org/comm-central/find?text=&string=-aero.css

The specific file names given in comment 2 are the files that live in the Instantbird repository.

Comment 11

[Florian Quèze [:florian]]

A look at the more thorough MXR query http://mxr.mozilla.org/comm-central/search?string=%include&find=css
shows that these 3 files may also want to have their license header preprocessed out:
http://mxr.mozilla.org/comm-central/source/mail/components/im/themes/chat.css
http://mxr.mozilla.org/comm-central/source/mozilla/browser/base/content/highlighter.css
http://mxr.mozilla.org/comm-central/source/mozilla/mobile/xul/themes/core/tablet.css

Comment 12

[Gervase Markham [:gerv]]

:flo: I tried to fix this using my script, but it's a big pain in the backside because the script firstly assumes MPL2 is correct, and then if you force past that it doesn't detect the license block as one it needs to remove, and if you fix that it assumes the comment character currently in use is the correct one for any replacement license. <sigh>

These files are correctly licensed. If someone wants to go through and change the comment character, I will applaud them from the sidelines :-)

Gerv