428144 - Fix Tb's license.html generation following bug 368091

Status: RESOLVED FIXED

(Thunderbird :: General, defect)

Description

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

Once bug 368091 lands, Tb will need to preprocess toolkit/content/license.html to include its EULA block before handing that to the Makefile goo I wrote for bug 427316.

Question 1: Does Tb also want to store the license in a jar like Firefox is doing, or do you only ever intend to care about the stand-alone license.html file?

Question 2: Where do you want your app-license.html file (the HTML snippet for the EULA block) to live?  Firefox's will live in browser/base/content/overrides, since that makes sense for the structure of the jar it ends up in (and parallels Fx's locale chrome overrides), but that might not make sense for Tb.

I have what I think is a fix for this right now; rebuilding my Tb tree so I can test.

Comment 1

[Phil Ringnalda (:philor)]

No reason to believe we'll ever want it jarred up - that would require writing a viewer app that at the very least knows how to print, and I don't see us wanting to support installations on machines that don't have any program capable of rendering HTML that badly.

As to where, if it's not too inconvenient, other-licenses/branding/thunderbird/ is probably the right place, given that the text is about _official_ binaries (don't mention to Fx that they should really have theirs there, too, and only include it with official branding); if that's too inconvenient, mail/app/ with the makefile and those other slightly misplaced bits and bobs is fine, and we can worry about branding when we have unofficial branding that isn't too frightening to build.

Comment 2

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

Attachment: Fix, v1

This should do it.  Two (and a half) notes:

* Phil and I chatted last night about what exactly it means to be an "official binary", and I noted that (at least on the Mac, which is all I have access to) Moz apps make you agree to the EULA for unbranded nightlies, too, so I put app-license.html in mail/app.

• Half-point: This is still the MoCo EULA line, so when you get your MailCo EULA up and running, you'll have to fix this file.

* The clean/clobber rule I added in bug 427316 didn't seem to be called on distclean, which is bad (it's possible that it was an artifact of my horked Terminal last night, but that would be a bit far afield of the other symptoms), so I switched that to a GARBAGE rule and moved it to the top (global GARBAGE at the top seems easier to discover than global GARBAGE at the bottom near the licence-making rules).

Comment 3

[Dan Mosedale (:dmosedale, :dmose)]

Is there some specific reason not to change the "Mozilla Corporation" string to "Mozilla Messaging" and point that URL to <http://www.mozillamessaging.com/>?  I can't imagine why the EULA URL itself would change.

Comment 4

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

(In reply to comment #3)
> Is there some specific reason not to change the "Mozilla Corporation" string to
> "Mozilla Messaging" and point that URL to <http://www.mozillamessaging.com/>? 

Not that I know of; I was just restoring the text that was there before bug 368091, but if you're ready to start changing that now, let's do it.

> I can't imagine why the EULA URL itself would change.

It'll have to change because that URL is set up to redirect to MoCo's EULA page.  It's a bit annoying; we had to invent a whole new EULA URL for Foundation-EULAed apps because of this.  

If we (MoFo/mozilla.org) persist with the rule that the "canonical" EULA URL for all apps for which the Foundation owns the trademarks (some of which it may license to its corporate subsidiaries), we'll have to add a third mozilla.org EULA url to join http://www.mozilla.org/foundation/EULA/ and http://www.mozilla.org/legal/eula/ :P

Comment 5

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

(In reply to comment #4)
> > I can't imagine why the EULA URL itself would change.
> 
> It'll have to change because that URL is set up to redirect to MoCo's EULA
> page.  It's a bit annoying; we had to invent a whole new EULA URL for
> Foundation-EULAed apps because of this.  

See bug 343220 comment 10 and 11 for some of the history of this.

Comment 6

[Phil Ringnalda (:philor)]

Comment on attachment 314870 [details] [diff] [review]
Fix, v1

Lucky for us, decisions about whether or not a EULA granting a license from MoMe can live next to the 2.0 one from MoCo and the 1.5 one from MoFo on mozilla.com are well above our pay grade.

Please make the changes in app-license.html dmose asked for in comment 3 (except, pretend he asked for s/the Mozilla Corporation/Mozilla Messaging/, because we don't have a the), and SHIP IT!

Comment 7

[Phil Ringnalda (:philor)]

(And pretend I asked davida before saying that, instead of after, and thus said "s/the Mozilla Corporation/Mozilla Messaging, Inc./")

Comment 8

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

Checked in with the change from comment 7.

RCS file: /cvsroot/mozilla/mail/app/app-license.html,v
done
Checking in mail/app/app-license.html;
/cvsroot/mozilla/mail/app/app-license.html,v  <--  app-license.html
initial revision: 1.1
done
Checking in mail/app/Makefile.in;
/cvsroot/mozilla/mail/app/Makefile.in,v  <--  Makefile.in
new revision: 1.86; previous revision: 1.85
done

Someone be sure to file a bug on the EULA URL mess ;)