427316 - Make Tb use a sanitized toolkit/content/license.html instead of forked mail/license.html

Status: RESOLVED FIXED

(Thunderbird :: General, defect)

Description

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Attachment: use a sanitized toolkit/content/license.html v1

New part 1 of "one license to rule them all": make Tb sanitize toolkit/content/license.html for any-browser usage and use it instead of maintaining a forked mail/license.html

This works nicely for me on Mac OS X, but I don't have $(OTHER_PLATFORMS) so I haven't tested there (particularly the linefeed conversion stuff on WINNT; it should be unchanged, but I'd appreciate hearing that from someone on that OS that it is indeed still fine).

This simply wacks the "about:license" prefix from all of the anchors in the toolkit file and puts this new, sanitized license.html in $(objdir)/mail/ in the objdir case.  I've re-arranged the LICENSE_FILES declaration and libs:: rule for the license files to make sure the sanitized license.html is generated, but otherwise the whole mechanics are unchanged.

I'm not sure if there's a better way to refer to the location of the newly-sanitized license.html that works in both the srcdir and objdir cases, but mento has used the .. syntax in a couple of similar cases, so my guess is there's not one.

Also, it seems that mail/app/Makefile.in has no global clean/clobber rule or GARBAGE list (only per-platform ones), so I've added a global clean/clobber rule to clean up after these new files.  I'll switch this to a global GARBAGE if that's preferred.

Comment 1

[Phil Ringnalda (:philor)]

Comment on attachment 313867 [details] [diff] [review]
use a sanitized toolkit/content/license.html v1

Lovely, thanks so much for doing what I should have done in the first place. r=philringnalda

Comment 2

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Checking in mail/app/Makefile.in;
/cvsroot/mozilla/mail/app/Makefile.in,v  <--  Makefile.in
new revision: 1.85; previous revision: 1.84
done
Removing mail/license.html;
/cvsroot/mozilla/mail/license.html,v  <--  license.html
new revision: delete; previous revision: 1.11
done

SHIPPED!

It's always a pleasure to help my friends in mail-land :)