Closed Bug 431713 Opened 14 years ago Closed 14 years ago

update EULA to v3.0

Categories

(Firefox :: General, defect)

defect
Not set
normal

Tracking

()

RESOLVED FIXED
Firefox 3

People

(Reporter: beltzner, Assigned: Gavin)

References

Details

Attachments

(1 file, 13 obsolete files)

1.09 KB, patch
Details | Diff | Splinter Review
Updated EULA text attached.

Also, for places where we control formatting:

>> Harvey; what's the requirement for emphasis, here? Do we need ALL CAPS? Can I
>> perhaps small caps? :) Am I pushing it?
>> 
>
>Emphasis could be: 1) italics; 2) small caps; 3) bold; 4) underline (very ugly
>and not recommended. There should be some. your choice from the above.
>recommend 1 or 2.
Assignee: nobody → beltzner
Flags: blocking-firefox3+
Attached file EULA v3.0 (txt, UTF-8) (obsolete) —
First pass at a patch:
 - updates browser/EULA
 - updates browser/EULA.rtf (and switches ALL CAPS to bold)
 - updates browser/base/content/EULA.xhtml (and switches ALL CAPS to bold)

Note that the previous text version of the EULA v3.0 is obsolete, as Harvey and I found some errors. This diff should be taken as canonical.

Still do to:
 - update browser/branding/unofficial/license.r
 - update browser/app/profile/firefox.js#646 (to rev the version for updates)
Attachment #318853 - Attachment is obsolete: true
Attachment #318934 - Attachment is obsolete: true
Attachment #318975 - Flags: review?(mconnor)
Oops, forgot to bold a section in the xhtml!
Attachment #318975 - Attachment is obsolete: true
Attachment #318975 - Flags: review?(mconnor)
Attachment #318976 - Flags: review?(mconnor)
And now with less curly apostrophes in the rtf, and only one clause 5!
Attachment #318976 - Attachment is obsolete: true
Attachment #318978 - Flags: review?(mconnor)
Attachment #318976 - Flags: review?(mconnor)
Attachment #318978 - Flags: review?(mconnor)
Attachment #318978 - Flags: review+
Attachment #318978 - Flags: approval1.9+
Keywords: checkin-needed
This is needed so this works right on Linux, we need to take this change at the same time.
Attachment #319029 - Flags: review?(gavin.sharp)
Whiteboard: [has patch][needs review Gavin][needs a bit more work]
Comment on attachment 319029 [details] [diff] [review]
bump version to 3, show EULA on first run for Linux

Please make sure to test that the elifdef works correctly, or just change to using simple #ifdefs.
Attachment #319029 - Flags: review?(gavin.sharp) → review+
Whiteboard: [has patch][needs review Gavin][needs a bit more work] → [has patch][needs a bit more work]
Comment on attachment 319029 [details] [diff] [review]
bump version to 3, show EULA on first run for Linux

yes, it works.  its documented, so it better work! (also, used in /mail)
Attachment #319029 - Flags: approval1.9?
Attachment #319029 - Flags: approval1.9? → approval1.9+
Just need to patch license.r now - I've had a look at how mento did this last time, and think I know what I'm doing. Will probably ask him for review, though.

Anyone know what file format to save that in? Mac UTF-8?
Whiteboard: [has patch][needs a bit more work] → [need to patch license.r]
Whiteboard: [need to patch license.r] → [need to patch license.r][ETA 5/3]
Connor, please review with attention to file format and apostrophes and such. I'm pretty sure I got it right.
Attachment #318978 - Attachment is obsolete: true
Attachment #319214 - Flags: review?(mconnor)
Whiteboard: [need to patch license.r][ETA 5/3] → [has patch][needs review mconnor]
Attachment #318978 - Flags: review+
Attachment #318978 - Flags: approval1.9+
Bah, messed up the hex offset in the browser/base/app/macbuild/license.r file; fixed here.
Attachment #319214 - Attachment is obsolete: true
Attachment #319276 - Flags: review?(mconnor)
Attachment #319214 - Flags: review?(mconnor)
Comment on attachment 319276 [details] [diff] [review]
update EULA to v3.0 in all places (EULA, EULA.rtf, EULA.xhtml, license.r)

looks good to me, ship it.
Attachment #319276 - Flags: review?(mconnor)
Attachment #319276 - Flags: review+
Attachment #319276 - Flags: approval1.9+
Whiteboard: [has patch][needs review mconnor] → [has patch][has review][has approval]
mozilla/browser/EULA 	1.6
mozilla/browser/EULA.rtf 	1.4
mozilla/browser/base/content/EULA.xhtml 	1.2
mozilla/browser/app/macbuild/license.r 	1.4
mozilla/other-licenses/branding/firefox/license.r 	1.4 
Keywords: checkin-needed
Whiteboard: [has patch][has review][has approval]
Target Milestone: --- → Firefox 3
Landed mconnor's patch as well:
mozilla/browser/app/profile/firefox.js 	1.331 
Status: NEW → RESOLVED
Closed: 14 years ago
Resolution: --- → FIXED
Had to undo the Linux default change temporarily because the EULA dialog causes havoc on the unit test/Talos machines.

http://bonsai.mozilla.org/cvsview2.cgi?diff_mode=context&whitespace_mode=show&subdir=mozilla/browser/app/profile&command=DIFF_FRAMESET&file=firefox.js&rev1=1.331&rev2=1.332

Will need to update the testing/talos profiles to avoid this problem.
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
Do you need to update browser/branding/unofficial/license.r, too, or are you projecting further changes to the EULA before the next time you alpha?  

I forget which combination of build flags gets you using that license.r, but I know it's the one that was used for official alpha releases since I found bugs in it in Alpha 1 ;)
Curses!
Attachment #319317 - Flags: review?(mconnor)
Attachment #319317 - Flags: approval1.9?
Attachment #319317 - Flags: review?(mconnor)
Attachment #319317 - Flags: review+
Attachment #319317 - Flags: approval1.9?
Attachment #319317 - Flags: approval1.9+
I think this is probably sufficient, but I'm not entirely sure whether Talos uses automation.py for its profile creation (or whether a change in CVS will automatically be pushed to production machines).
Assignee: beltzner → gavin.sharp
Status: REOPENED → ASSIGNED
Attachment #319320 - Flags: review?(mconnor)
mozilla/browser/branding/unofficial/license.r 	1.4 
Assignee: gavin.sharp → beltzner
Status: ASSIGNED → NEW
Attached patch patch (obsolete) — Splinter Review
This one includes testing/tools/profiles/createTestingProfile.py
Attachment #319029 - Attachment is obsolete: true
Attachment #319276 - Attachment is obsolete: true
Attachment #319317 - Attachment is obsolete: true
Attachment #319320 - Attachment is obsolete: true
Attachment #319320 - Flags: review?(mconnor)
Attached patch tweaked patch (obsolete) — Splinter Review
addressed some comments from mconnor on IRC.
Attachment #319322 - Attachment is obsolete: true
Attachment #319327 - Flags: review?(mconnor)
Comment on attachment 319327 [details] [diff] [review]
tweaked patch

r+a=mconnor
Attachment #319327 - Flags: review?(mconnor)
Attachment #319327 - Flags: review+
Attachment #319327 - Flags: approval1.9+
Whiteboard: [has patch][has review][has approval]
mozilla/browser/components/nsBrowserGlue.js 	1.92
mozilla/browser/app/profile/firefox.js 	1.333
mozilla/build/pgo/automation.py.in 	1.10
mozilla/testing/mochitest/runtests.pl.in 	1.53
mozilla/testing/tools/profiles/createTestingProfile.py 	1.5 
Status: NEW → RESOLVED
Closed: 14 years ago14 years ago
Keywords: checkin-needed
Resolution: --- → FIXED
Whiteboard: [has patch][has review][has approval]
I had to back out the change of default for Linux again, because apparently Talos doesn't use createTestingProfile.py. Will need to investigate further.
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
Depends on: 432321
After talking with Alice and robcee, filed bug 432321 to get the changes made to the talos profiles in production.
I think we need to update build-seamonkey-util.pl to add the override pref as well, since the bloat test timed out on the linux machine when this patch was in.
Assignee: beltzner → gavin.sharp
Status: REOPENED → NEW
Attached patch build-seamonkey-util.pl patch (obsolete) — Splinter Review
This should fix the bloat test timeouts. Not sure who's best to review this.
Attachment #319478 - Flags: review?(robert)
Attachment #319478 - Flags: review?(nrthomas)
Whiteboard: [waiting on build for talos config changes]
Comment on attachment 319478 [details] [diff] [review]
build-seamonkey-util.pl patch

Looks fine to me, r+
Attachment #319478 - Flags: review?(nrthomas) → review+
Attachment #319478 - Flags: review?(robert)
Whiteboard: [waiting on build for talos config changes] → [can land w/talos changes]
(In reply to comment #27)
> Created an attachment (id=319478) [details]
> build-seamonkey-util.pl patch

Landed this patch in advance of re-fixing this:
mozilla/tools/tinderbox/build-seamonkey-util.pl 	1.388
Status: NEW → ASSIGNED
Whiteboard: [can land w/talos changes] → [needs 432231 to land]
Whiteboard: [needs 432231 to land] → [needs 432321 to land]
Attached patch re-enableSplinter Review
Now that bug 432321 is fixed we should be good to go.
Attachment #319327 - Attachment is obsolete: true
Attachment #319478 - Attachment is obsolete: true
mozilla/browser/app/profile/firefox.js 	1.335 
Status: ASSIGNED → RESOLVED
Closed: 14 years ago14 years ago
Resolution: --- → FIXED
Whiteboard: [needs 432321 to land]
Verified on Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9pre) Gecko/2008050707 Minefield/3.0pre.

still need to check on mac and windows
Depends on: 432753
Depends on: 433298
Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10.5; en-US; rv:1.9) Gecko/2008051202 Firefox/3.0

Found a new bug making sure this one was FIXED on MAC

You need to log in before you can comment on or make changes to this bug.