We wont actually roll this major update out to users. We hit some problems when doing major update from FF1.5.0.x -> FF2.0.0.x. We want to make sure we dont hit problems again when doing major update from FF2.0.0.x -> FF3. We want to try this early enough that if we find problems, we can still fix them before the FF3 release, but not so early that extensions/DEX changes are unstable. A beta seems reasonable for this, but dmills will tell us when its all ready to start trying.

This is a Build Team Q3 goal, hence this tracking bug.

Bumped out to Q4 goal, as beta1 slipped, and we feel we only *need* it done before beta2.

Can we get "test" snippets made for 2.0.0.12 to 3.0b2? This is blocking partner distro MU testing as well. We'd like to do a sanity check with at minimum Yahoo!Japan and Google.

make that 2.0.0.11 -> 3.0b2

updating summary to match new schedule of early Jan. Moved from Q4 to Q1. This needs to be completed, and any possible bugs/feedback landed into trunk, before beta3.

updating summary to match latest shipped FF2.0.0.12 release.

duh, sorry, I got confused. Latest shipped release is FF2.0.0.11, so I'm resetting back the summary. Sorry for the noise.

I've run some simple tests on the three main platforms. They all apply cleanly and the app starts up afterwards, and seems to be functional. We should probably be OK generate snippets for QA testing, but the diff results below indicate we'll have to adjust the removed-file list ahead of 3.0b3, so that the Fx2-only files are expunged correctly on the major update. Might also inform some targeted testing. These are recursive directory-diffs between "en-US 2.0.0.11 updated with the 3.0b2 complete mar" and a "3.0b2 that was unpacked but never run" (updates were done in the app, rather than running the updater utility directly). If the differences aren't applicable to all platforms, then only those indicated in brackets are affected (but see heading line too). Assorted MathML files that should have been removed (fixed in b3 by bug 408356) Only in 20011-updated/res/fonts: mathfontCMEX10.properties Only in 20011-updated/res/fonts: mathfontCMSY10.properties Only in 20011-updated/res/fonts: mathfontMath1.properties Only in 20011-updated/res/fonts: mathfontMath2.properties Only in 20011-updated/res/fonts: mathfontMath4.properties Only in 20011-updated/res/fonts: mathfontMTExtra.properties Only in 20011-updated/res/fonts: mathfontPUA.properties Only in 20011-updated/res/fonts: mathfontSymbol.properties Similar files that need to be investigated: Only in 20011-updated/res/fonts: fontEncoding.properties Only in 20011-updated/res/fonts: pangoFontEncoding.properties (linux) Only in 20011-updated/res/fonts: fontNameMap.properties (win32) Only in 20011-updated.app/Contents/MacOS/res: viewer.properties (mac) Assorted binaries/JS components that probably need to be added to the removed-files.in, after confirming why we no longer ship them: Only in 20011-updated/components: nsDictionary.js Only in 20011-updated/components: nsInterfaceInfoToIDL.js Only in 20011-updated/components: nsXmlRpcClient.js Only in 20011-updated/: libxpcom_compat.so (.dll on win32, .dylib on mac) Only in 20011-updated/: libxpistub.so (ditto) Assorted xpt files on Mac: Only in 20011-updated.app/Contents/MacOS/components: accessibility.xpt Only in 20011-updated.app/Contents/MacOS/components: gksvgrenderer.xpt Only in 20011-updated.app/Contents/MacOS/components: jsconsole.xpt Only in 20011-updated.app/Contents/MacOS/components: necko_data.xpt Only in 20011-updated.app/Contents/MacOS/components: nsKillAll.js Only in 20011-updated.app/Contents/MacOS/components: passwordmgr.xpt Only in 20011-updated.app/Contents/MacOS/components: progressDlg.xpt Only in 20011-updated.app/Contents/MacOS/components: search.xpt Only in 20011-updated.app/Contents/MacOS/components: websrvcs.xpt Only in 20011-updated.app/Contents/MacOS/components: widget_mac.xpt Only in 20011-updated.app/Contents/MacOS/components: xml-rpc.xpt Only in 20011-updated.app/Contents/MacOS/components: xpcom_obsolete.xpt From assorted cleanup ?: Only in 20011-updated/: readme.txt (linux) Only in 20011-updated.app/Contents/MacOS: init.d Only in 20011-updated.app/Contents/MacOS: redo-prebinding.sh Only in 20011-updated.app/Contents/MacOS: LICENSE Only in 20011-updated.app/Contents/MacOS/defaults/profile: prefs.js Only in 20011-updated/extensions/inspector@mozilla.org/chrome: icons (win32) From packaging error in Mac 2.0.0.x ?: Only in 20011-updated.app/Contents/MacOS/extensions/inspector@mozilla.org/chrome: chromelist.txt Only in 20011-updated.app/Contents/MacOS/chrome: chromelist.txt A file only in the Mac mar ?: Only in 3b2-unmodified.app/Contents/MacOS/components: spellchecker.xpt Probably harmless on win32: Only in 20011-updated/components: compreg.dat Only in 20011-updated/components: xpti.dat Known win32 issue (bug 404340) Binary files 20011-updated/freebl3.chk and 3b2-unmodified/freebl3.chk differ Binary files 20011-updated/softokn3.chk and 3b2-unmodified/softokn3.chk differ For completeness, files that normally change in an update, plus an expected change in channel-prefs.js: Only in 20011-updated/: active-update.xml Only in 20011-updated/: updates Only in 20011-updated/: updates.xml diff -r 20011-updated/defaults/pref/channel-prefs.js 3b2-unmodified/defaults/pref/channel-prefs.js 1,2c1,2 < //@line 2 "/builds/tinderbox/Fx-Mozilla1.8-release/Linux_2.4.21-27.0.4.EL_Depend/mozilla/browser/app/profile/channel-prefs.js" < pref("app.update.channel", "release"); --- > //@line 2 "/builds/tinderbox/Fx-Mozilla1.9-Release/Linux_2.6.18-8.el5_Depend/mozilla/browser/app/profile/channel-prefs.js" > pref("app.update.channel", "beta"); Only in 20011-updated/: .autoreg (win32) Only in 20011-updated/: removed-files (win32 when unpacked instead of installed)

This work is to test upgrading from FF2 -> FF3.0beta2. To clarify, a direct upgrade from FF1.5.x -> FF3.0beta2 will *not* be possible. Any 1.5 users who want to upgrade to 3.0 can do so by taking a few hops: 1.5 -> 2.0.0.6 -> 2.0.0.11 -> FF3beta2.

(In reply to comment #8) Inline comments for each fix: > Similar files that need to be investigated: > Only in 20011-updated/res/fonts: fontEncoding.properties > Only in 20011-updated/res/fonts: pangoFontEncoding.properties (linux) > Only in 20011-updated/res/fonts: fontNameMap.properties (win32) These three live in the older parts of gfx, and were deprecated by moving to Thebes. Added to removed-files.in. > Only in 20011-updated.app/Contents/MacOS/res: viewer.properties (mac) Not very selective packaging on Mac means we got this file from webshell/tests/ for no extra charge on 1.8. Added to removed-files.in. > Assorted binaries/JS components that probably need to be added to the > removed-files.in, after confirming why we no longer ship them: > Only in 20011-updated/components: nsDictionary.js > Only in 20011-updated/components: nsXmlRpcClient.js Part of xml-rpc, which went away in bug 392845. Added to removed-files.in. > Only in 20011-updated/components: nsInterfaceInfoToIDL.js Part of SOAP/webservces, which was disabled in bug 332174 - attachment 272903 [details] [diff] [review] should have handled this but never landed. Added to removed-files.in. > Only in 20011-updated/: libxpcom_compat.so (.dll on win32, .dylib on mac) Removed in bug 334688, when xpcom/obsolete was disabled. Added to removed-files.in. > Only in 20011-updated/: libxpistub.so (ditto) Went away with libxul (bug 345517), but missed from remove list. Added to removed-files.in. > Assorted xpt files on Mac: > Only in 20011-updated.app/Contents/MacOS/components: accessibility.xpt > Only in 20011-updated.app/Contents/MacOS/components: gksvgrenderer.xpt > Only in 20011-updated.app/Contents/MacOS/components: jsconsole.xpt > Only in 20011-updated.app/Contents/MacOS/components: necko_data.xpt Obsolete xpt files I assume. Added to removed-files.in. > Only in 20011-updated.app/Contents/MacOS/components: nsKillAll.js Bug 348347 removed this file. > Only in 20011-updated.app/Contents/MacOS/components: passwordmgr.xpt > Only in 20011-updated.app/Contents/MacOS/components: progressDlg.xpt > Only in 20011-updated.app/Contents/MacOS/components: search.xpt > Only in 20011-updated.app/Contents/MacOS/components: websrvcs.xpt > Only in 20011-updated.app/Contents/MacOS/components: widget_mac.xpt > Only in 20011-updated.app/Contents/MacOS/components: xml-rpc.xpt > Only in 20011-updated.app/Contents/MacOS/components: xpcom_obsolete.xpt More obsolete xpt files (including xml-rpc & SOAP). Added to removed-files.in. > From assorted cleanup ?: > Only in 20011-updated/: readme.txt (linux) Removing Talkback in bug 384174 removed every copy of readme.txt on Linux. It's called README.txt on the other two platforms, so add that to unix/packages-static (I checked it's in dist/bin on the tinderboxes), and remove the lowercase version on update. > Only in 20011-updated.app/Contents/MacOS: init.d Strays from the mac packaging goodness. We can kill the README in there, but not the dir itself. > Only in 20011-updated.app/Contents/MacOS: redo-prebinding.sh This script went away in bug 325910. > Only in 20011-updated.app/Contents/MacOS: LICENSE > Only in 20011-updated.app/Contents/MacOS/defaults/profile: prefs.js These two are packaging glitches, and lead to the browser/app/Makefile.in change. The basic problem is that dist/bin is rsync'd to dist/Firefox.app before prefs.js and LICENSE are copied in. The change fixes up prefs.js but leaves of LICENSE. It's not clear to be that we need packaging the MPL when the apps are released under the EULA (http://www.mozilla.org/MPL/). Might need to follow up for the other platforms. > Only in 20011-updated/extensions/inspector@mozilla.org/chrome: icons (win32) icons/default/winInspectorMain.ico moved into the jar. Can get the ico but not the dirs, so this will recur in the automated testing. Added to removed-files.in. > From packaging error in Mac 2.0.0.x ?: > Only in > 20011-updated.app/Contents/MacOS/extensions/inspector@mozilla.org/chrome: > chromelist.txt > Only in 20011-updated.app/Contents/MacOS/chrome: chromelist.txt These are the only two chromelist.txt files in any of the 2.0 or 3.0 builds I tested here. Added to removed-files.in. > A file only in the Mac mar ?: > Only in 3b2-unmodified.app/Contents/MacOS/components: spellchecker.xpt Bug 376205 added a remove instruction for this, so the Mac mar has both ADD and REMOVE. Whee! Since we still build a spell checker, it seem reasonable to include the xpt for all platforms. So cull it from removed-files.in and add to the two packages-static.

This is the same as the previous patch, except for adding the missing .txt to the chrome/chromelist entry. >> Only in 20011-updated/: readme.txt (linux) >Removing Talkback in bug 384174 removed every copy of readme.txt on Linux. It's >called README.txt on the other two platforms, so add that to >unix/packages-static (I checked it's in dist/bin on the tinderboxes), and >remove the lowercase version on update. To clarify, the situation is: Linux Mac Win32 Fx 2.0.0.11 readme.txt README.txt README.txt Fx 3.0b2 <no file> README.txt README.txt Fx2 afterMU test readme.txt README.txt README.txt

Sorry for the churn, but I missed the res/ prefix on viewer.properties.

Expected differences with the repacked mar files are... Linux: Only in 20011-updated-v2/: README.txt Only in 20011-updated-v2/: active-update.xml diff -r 20011-updated-v2/defaults/pref/channel-prefs.js 3b2-unmodified/defaults/pref/channel-prefs.js 1,2c1,2 < //@line 2 "/builds/tinderbox/Fx-Mozilla1.8-release/Linux_2.4.21-27.0.4.EL_Depend/mozilla/browser/app/profile/channel-prefs.js" < pref("app.update.channel", "release"); --- > //@line 2 "/builds/tinderbox/Fx-Mozilla1.9-Release/Linux_2.6.18-8.el5_Depend/mozilla/browser/app/profile/channel-prefs.js" > pref("app.update.channel", "beta"); Only in 20011-updated-v2/: updates Only in 20011-updated-v2/: updates.xml ie the usual update stuff, plus the channel change (won't happen for end users when we offer them 3.0.something, and README.txt being added. Mac: Only in 20011-updated-v2.app/Contents/MacOS: active-update.xml Files 20011-updated-v2.app/Contents/MacOS/defaults/pref/channel-prefs.js and 3b2-unmodified.app/Contents/MacOS/defaults/pref/channel-prefs.js differ Only in 20011-updated-v2.app/Contents/MacOS/defaults/profile: prefs.js Only in 20011-updated-v2.app/Contents/MacOS: init.d Files 20011-updated-v2.app/Contents/MacOS/removed-files and 3b2-unmodified.app/Contents/MacOS/removed-files differ Only in 20011-updated-v2.app/Contents/MacOS: updates Only in 20011-updated-v2.app/Contents/MacOS: updates.xml Again, the expected update files, leftover init.d dir that we can't get rid of with the current updater, and removed-files differs because of the way repacked the mar: unpack with unwrap_full_update.pl, modify removed-files, use make_full_update.sh. This was to handle the spaces in .../Default Plugin/... properly. For the other 2 platforms I just called mar -x, modified update.manifest, copied in README.txt on linux, and then used mar -c. Win32: Only in 20011-updated-v2/: .autoreg Only in 20011-updated-v2/: active-update.xml diff -r 20011-updated-v2/defaults/pref/channel-prefs.js 3b2-unmodified/defaults/pref/channel-prefs.js 1,2c1,2 < //@line 2 "/cygdrive/c/builds/tinderbox/Fx-Mozilla1.8-Release/WINNT_5.2_Depend/mozilla/browser/app/profile/channel-prefs.js" < pref("app.update.channel", "release"); --- > //@line 2 "e:\fx19rel\WINNT_5.2_Depend\mozilla\browser\app\profile\channel-prefs.js" > pref("app.update.channel", "beta"); Only in 20011-updated-v2/extensions/inspector@mozilla.org/chrome: icons Binary files 20011-updated-v2/freebl3.chk and 3b2-unmodified/freebl3.chk differ Only in 20011-updated-v2/: removed-files Binary files 20011-updated-v2/softokn3.chk and 3b2-unmodified/softokn3.chk differ Only in 20011-updated-v2/uninstall: uninstall.update Only in 20011-updated-v2/: updates Only in 20011-updated-v2/: updates.xml ie The usual update files, plus left over icons/default dir in inspector extension

This uses the repacked mar files in firefox/nightly/experimental/bug394046, generating on the linux automation box for trunk production (fx-linux-1.8-slave2). It's based on the equivalent moz180 config; I'm using patcher and the tools from the HEAD, checkout at ~ 9am today.

I'm not expecting no differences out of this, but comment #13 is a fair approximation. Some of those files (like active-update.xml, updates.xml) are generated by the app, so they won't show up when we run the updater directly. The main thing is to get some automated testing on the locales.

Comment on attachment 296553 [details] [diff] [review] [checked in] New moz18-branch-major-update-patcher2.cfg Hmm, what does specifying the complete path in the <partial> section do? Can you just not have the <parial> section?

Comment on attachment 296553 [details] [diff] [review] [checked in] New moz18-branch-major-update-patcher2.cfg (In reply to comment #17) > (From update of attachment 296553 [details] [diff] [review]) > Hmm, what does specifying the complete path in the <partial> section do? You get almost identical partial and complete snippets, except for type={partial,complete}. AIUI the path specifies the local filename, which --download uses for renaming when grabbing the completes, and specifies the partial filename when they're generated. > Can you just not have the <parial> section? Apparently you can't: ASSERT: SubstitutePath() called with null path at MozAUSLib.pm line 341. and it bombs out. We could remove the partial.txt files before publishing, if you're looking to avoid the situation where the update fails, and people end up downloading another big file only for it to fail again. Checking in moz18-branch-major-update-patcher2.cfg; /cvsroot/mozilla/tools/patcher-configs/moz18-branch-major-update-patcher2.cfg,v <-- moz18-branch-major-update-patcher2.cfg initial revision: 1.1 done

(In reply to comment #18) > We could remove the partial.txt files before publishing, if > you're looking to avoid the situation where the update fails, and people end up > downloading another big file only for it to fail again. No, sounds like you're doing the reasonable thing, we want both partial and complete snippets (if only because we've done it that way in the past). IIRC AUS requires them both to be there which is why e.g. previous releases are like that. Your answer to the partial section question makes sense, re-reading my question I think I was thinking of the major update as if it was being specified like a previous release, we just need to actually support major updates instead of all this hackery :)

Comment on attachment 296536 [details] [diff] [review] Assorted packaging fixes for b3 - v3 Based on the results of the automated verification for locales, this is going to need more work. Clearing review request until that's done.

These are changes resulting from the automated check over all locales, which found: * linux - talkback.so and master.ini not removed, path corrected in removed-files.in * chrome/chromelist.txt is present on all three platforms, moved outside of the #ifdef XP_MACOSX * some locales hadn't caught up with the myspell --> hunspell change for spellchecking, which requires then to move their dictionaries in CVS. For 3.0b2 this was pl, pt-PT, sk, uk and zh-TW. I've checked each locale that shipped a dict for 2.0.0.11: ** These ones have subsequently updated their locale and are OK in 3.0b3pre nightlies: fr, lt, ru, sk, uk ** pl-PL is also fixed in nightlies, but changed the filenames and so the old ones get added to removed-files.in ** bugs filed against pt-PT (bug 412586) and zh-TW (bug 412589) to get them to indicate what they are going to do. If they ship a dict we do nothing, if they pull it then we'll need to add to removed-files.in. zh-TW might be painful because they ship the en-US dictionary, which leads me to ... * the be and ca locales dropped some searchplugins for 3.0b2, and it seems likely that other locales will also make adjustments. The consensus from Axel and Mic was to remove the deprecated plugins on update, but this could be a bit painful. For example, be removed several en-US plugins like amazondotcom.xml. We can't blanket add that to removed-files.in because it'll break other locales. And removed-files.in is not regenerated for each locale, so we can't have something like #if AB_CD=be amazondotcom.xml ... #endif What do you think ?

(In reply to comment #21) > Created an attachment (id=297338) [details] > Assorted packaging fixes for b3 - v4 > > These are changes resulting from the automated check over all locales, which > found: Clarification: the changes in the v4 patch with respect to v3 are due to the automated check ...

Comment on attachment 297338 [details] [diff] [review] Assorted packaging fixes for b3 - v4 >Index: app/Makefile.in >+install:: $(srcdir)/profile/prefs.js >+ $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile Remove the install target, we don't use in-tree install targets any more. >Index: installer/removed-files.in >-extensions/talkback@mozilla.org/components/master.ini >-extensions/talkback@mozilla.org/components/talkback.so >+extensions/talkback@mozilla.org/components/talkback/master.ini >+extensions/talkback@mozilla.org/components/talkback/talkback.so Are you sure the change to master.ini is correct on all platforms? I remember it being different on different platforms.

(In reply to comment #23) > (From update of attachment 297338 [details] [diff] [review]) > >Index: app/Makefile.in > > >+install:: $(srcdir)/profile/prefs.js > >+ $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile > > Remove the install target, we don't use in-tree install targets any more. Done. > >Index: installer/removed-files.in > > >-extensions/talkback@mozilla.org/components/master.ini > >-extensions/talkback@mozilla.org/components/talkback.so > >+extensions/talkback@mozilla.org/components/talkback/master.ini > >+extensions/talkback@mozilla.org/components/talkback/talkback.so > > Are you sure the change to master.ini is correct on all platforms? I remember > it being different on different platforms. I think this OK, because the files for each platform are #ifdef'd, and I'm making changes in the part that for !XP_WIN and !XP_MACOSX.

Comment on attachment 297779 [details] [diff] [review] [checked in] Assorted packaging fixes for b3 - v4 for checkin Requesting approval to land this patch prior to b3. It's all packaging changes to prepare for a Fx2 -> Fx3 major update before we hit Fx 3 final. Would like to get this baking in nightlies soon - the chance of regressions should be low.

Comment on attachment 297779 [details] [diff] [review] [checked in] Assorted packaging fixes for b3 - v4 for checkin Moving bug to the blocker list so you don't need patch approvals to land on trunk

Comment on attachment 297779 [details] [diff] [review] [checked in] Assorted packaging fixes for b3 - v4 for checkin Checking in app/Makefile.in; /cvsroot/mozilla/browser/app/Makefile.in,v <-- Makefile.in new revision: 1.142; previous revision: 1.141 done Checking in installer/removed-files.in; /cvsroot/mozilla/browser/installer/removed-files.in,v <-- removed-files.in new revision: 1.32; previous revision: 1.31 done Checking in installer/unix/packages-static; /cvsroot/mozilla/browser/installer/unix/packages-static,v <-- packages-static new revision: 1.144; previous revision: 1.143 done Checking in installer/windows/packages-static; /cvsroot/mozilla/browser/installer/windows/packages-static,v <-- packages-static new revision: 1.147; previous revision: 1.146 done

Benjamin, Ted I checked nightlies after attachment 297779 [details] [diff] [review] landed, and Mac now has defaults/profile/prefs.js (yay!), but linux and win32 no longer do (boo!). Could that be the removal of the install:: target ? The Makefile.in changes are http://bonsai.mozilla.org/cvsview2.cgi?diff_mode=context&whitespace_mode=show&file=Makefile.in&branch=&root=/cvsroot&subdir=/mozilla/browser/app&command=DIFF_FRAMESET&rev1=1.141&rev2=1.142

The 2.0.0.11 --> 3.0b2 path was overwritten by the 2.0.0.11 --> 2.0.0.12, since they both use releasetest/release and betatest/beta channels. So move the major update to majortest/major so we can have our cake and eat it too. We won't publish major, but patcher needs it to be there to generate majortest.

The new snippets are published. QA, please use the majortest channel, rather than betatest or releasetest.

The problem with the missing prefs.js on linux & win32 (comment #28) is due to where the libs:: rule moved to. It was now early enough that it worked for mac, but managed to stash it in a mac-only ifdef. This patch moves it higher again, outside of that ifdef, and provides the monster quantity of context the first one should have had. Wasn't sure if you'd want to fold those two libs:: rules together. I'd like to get this for b3, because it'll make our update verify tests cleaner, and it's a minor regression over b2.

Comment on attachment 300721 [details] [diff] [review] [checked in] Fix defaults/profile/prefs.js packaging Would it be possible to land this for b3 ? It'll prevent a minor regression to the files copied into a new profile (compared to b2), but nothing functional in the app. The main benefit is in making Release's life easier when dealing with update verification logs for b3 and b4, and in making sure major updates work from Fx2. Try server builds confirm that this patch works on all platforms.

Comment on attachment 300721 [details] [diff] [review] [checked in] Fix defaults/profile/prefs.js packaging a=beltzner

Checking in browser/app/Makefile.in; /cvsroot/mozilla/browser/app/Makefile.in,v <-- Makefile.in new revision: 1.146; previous revision: 1.145 done

Is bug#418131 of concern here?

This is a slight improvement to check_updates.sh for the situation where diff returns the likes of Only in source/Firefox.app/Contents/MacOS/extensions: talkback@mozilla.org and tells you nothing about the contents of that directory. This is particularly painful when we make sure all the remnants of Talkback have been removed.

Results of 2.0.0.12 --> 3.0b3 updates are posted at https://build.mozilla.org/logs/Firefox_2.0.0.12_3.0b3_MU/ Attachment 304252 [details] [diff] was used to look inside leftover directories. This patch fixes up the issues detailed below. For linux: * not removed: chrome/icons/default/default.xpm (deprecated by bug 412049) * channel-prefs.js differs (beta vs release) - OK * leftover extensions/talkback@mozilla.org containing empty dirs - OK * not removed: res/cmessage.txt * not removed: xpicleanup The latter two were taking care of by bug 415330 (thanks philor!). There are also some searchplugins that were removed by locales, we're resolving what to do with that elsewhere. For mac, * channel-prefs.js, talkback, cmessage.txt and xpicleanup as above * we're removing README.txt when we shouldn't be (fallout from earlier Talkback changes and case-insensitivity) * init.d dir is now empty - OK * empty updates/0 directory, unsure where this comes from but should be harmless * not removed: res/bloatcycle.html. This was shipped in 2.0.0.x and 3.0b2, but haven't tracked down the change that removed it from 3.0b3. Not needed for release builds in any event. For win32, * channel-prefs.js, talkback, cmessage.txt and xpicleanup.exe as above * extensions/inspector@mozilla.org/chrome/icons is now empty (NB b4 removes DOMi altogether) * freebl3.chk and softokn3.chk difference still present Hoping to land this before the b4 freeze.

Comment on attachment 305737 [details] [diff] [review] [checked in] 2.0.0.12 --> 3.0b3 packaging fixes Checking in removed-files.in; /cvsroot/mozilla/browser/installer/removed-files.in,v <-- removed-files.in new revision: 1.40; previous revision: 1.39 done

FYI, it was bug 291088 that removed bloatcycle.html. Sorry for not adding it to the list at the time.

The plan here is to generate a 2.0.0.12 -> 3.0b4 update path after b4 ships, then run the automated checking. If QA has resources to test then they will.

This is a fairly big diff, since I never put the 2.0.0.12->3.0b3 changes up for review. The verify configs contain only the overlap of locales, so there should be no warnings about missing mar files.

Fx 2.0.0.12 --> 3.0b4 major update is now live on the majortest channel. Automated test results to follow tomorrow.

Results are at: https://build.mozilla.org/logs/Firefox_2.0.0.12_3.0b4_MU/ We don't need to remove any core files this time, woot!

Here's a list of searchplugins which are left behind after an update. Many have unique names, but see be, es-AR, es-ES, sv-SE and zh-CN for exceptions.

Bug 425053 filed for the search plugins issue.

(In reply to comment #48) > Bug 425053 filed for the search plugins issue. > Now that bug#425053 is fixed, is there anything left to do here in this bug?

We could do one more round of automated testing, to look for any files that need to be added to removed-files.in and shake out the final result for the searchplugins. The best time to do that would be after 3.0 RC1 (or even 3.0 RC1 build1).

nick, are we publishing these updates on the beta channel? Or has that been discussed somewhere?

(In reply to comment #51) > nick, are we publishing these updates on the beta channel? Or has that been > discussed somewhere? We've only used test channels to date, so no end-users have tried this out. Also haven't heard of any plans to include them.

ok, posted to mda.firefox and dev.builds: I definitely think we ought to turn on major updates for testing on the beta channel at some point soon, if we're going to turn them on for real with the release of FF3.

Can we get the next iteration of major updates set up for further testing?

Put the docs for snippet-generation in the URL.

Comment on attachment 327169 [details] [diff] [review] [checked in] patcher and verify configs for 2.0.0.14 ---> 3.0 Here's an update for 2.0.0.14 -> 3.0 final. There were no locale changes between 2.0.0.12 and 2.0.0.14. Between 3.0b4 and 3.0 there was +af, id, ku, mn, nn-NO, si, sr, sl -gu-IN +gu-IN linux win32 I've left si and sl out since they are beta locales and there's no 2.0.0.x equivalent.

Comment on attachment 327169 [details] [diff] [review] [checked in] patcher and verify configs for 2.0.0.14 ---> 3.0 >Index: testing/release/updates/moz18-firefox-linux-major.cfg >=================================================================== >RCS file: /cvsroot/mozilla/testing/release/updates/moz18-firefox-linux-major.cfg,v >retrieving revision 1.3 >diff -U50 -r1.3 moz18-firefox-linux-major.cfg >--- testing/release/updates/moz18-firefox-linux-major.cfg 17 Mar 2008 21:03:47 -0000 1.3 >+++ testing/release/updates/moz18-firefox-linux-major.cfg 27 Jun 2008 20:09:58 -0000 >@@ -1,2 +1,2 @@ >-# 2.0.0.12 linux, only locales available for both >-release="2.0.0.12" product="Firefox" platform="Linux_x86-gcc3" build_id="2008020121" locales="ar be ca cs da de el en-GB es-AR es-ES eu fi fr fy-NL ga-IE gu-IN he hu it ja ka ko lt mk nb-NO nl pa-IN pl pt-BR pt-PT ro ru sk sv-SE tr uk zh-CN zh-TW" channel="majortest" from="/firefox/releases/2.0.0.12/linux-i686/%locale%/firefox-2.0.0.12.tar.gz" to="/firefox/releases/3.0b4/linux-i686/%locale%/firefox-3.0b4.tar.bz2" >+# 2.0.0.14 linux, only locales available for both >+release="2.0.0.14" product="Firefox" platform="Linux_x86-gcc3" build_id="2008040414" locales="af ar be ca cs da de el en-GB es-AR es-ES eu fi fr fy-NL ga-IE gu-IN he hu it ja ka ko ku lt mk mn nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru sk sv-SE tr uk zh-CN zh-TW" channel="majortest" from="/firefox/releases/2.0.0.14/linux-i686/%locale%/firefox-2.0.0.14.tar.gz" to="/firefox/releases/3.0/linux-i686/%locale%/firefox-3.0.tar.bz2" >Index: testing/release/updates/moz18-firefox-mac-major.cfg >=================================================================== >RCS file: /cvsroot/mozilla/testing/release/updates/moz18-firefox-mac-major.cfg,v >retrieving revision 1.2 >diff -U50 -r1.2 moz18-firefox-mac-major.cfg >--- testing/release/updates/moz18-firefox-mac-major.cfg 17 Mar 2008 21:03:47 -0000 1.2 >+++ testing/release/updates/moz18-firefox-mac-major.cfg 27 Jun 2008 20:09:58 -0000 >@@ -1,2 +1,2 @@ >-# 2.0.0.12 mac, only locales available for both (no gu-IN or ka for 2.0.0.x on mac) >-release="2.0.0.12" product="Firefox" platform="Darwin_Universal-gcc3" build_id="2008020121" locales="ar be ca cs da de el en-GB es-AR es-ES eu fi fr fy-NL ga-IE he hu it ja-JP-mac ko lt mk nb-NO nl pa-IN pl pt-BR pt-PT ro ru sk sv-SE tr uk zh-CN zh-TW" channel="majortest" from="/firefox/releases/2.0.0.12/mac/%locale%/Firefox 2.0.0.12.dmg" to="/firefox/releases/3.0b4/mac/%locale%/Firefox 3.0 Beta 4.dmg" >+# 2.0.0.14 mac, only locales available for both (no gu-IN or ka for 2.0.0.x on mac) >+release="2.0.0.14" product="Firefox" platform="Darwin_Universal-gcc3" build_id="2008040413" locales="af ar be ca cs da de el en-GB es-AR es-ES eu fi fr fy-NL ga-IE he hu it ja-JP-mac ko ku lt mk mn nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru sk sv-SE tr uk zh-CN zh-TW" channel="majortest" from="/firefox/releases/2.0.0.14/mac/%locale%/Firefox 2.0.0.14.dmg" to="/firefox/releases/3.0/mac/%locale%/Firefox 3.0.dmg" >Index: testing/release/updates/moz18-firefox-win32-major.cfg >=================================================================== >RCS file: /cvsroot/mozilla/testing/release/updates/moz18-firefox-win32-major.cfg,v >retrieving revision 1.2 >diff -U50 -r1.2 moz18-firefox-win32-major.cfg >--- testing/release/updates/moz18-firefox-win32-major.cfg 17 Mar 2008 21:03:47 -0000 1.2 >+++ testing/release/updates/moz18-firefox-win32-major.cfg 27 Jun 2008 20:09:58 -0000 >@@ -1,2 +1,2 @@ >-# 2.0.0.12 win32, only locales available for both >-release="2.0.0.12" product="Firefox" platform="WINNT_x86-msvc" build_id="2008020121" locales="ar be ca cs da de el en-GB es-AR es-ES eu fi fr fy-NL ga-IE gu-IN he hu it ja ka ko lt mk nb-NO nl pa-IN pl pt-BR pt-PT ro ru sk sv-SE tr uk zh-CN zh-TW" channel="majortest" from="/firefox/releases/2.0.0.12/win32/%locale%/Firefox Setup 2.0.0.12.exe" to="/firefox/releases/3.0b4/win32/%locale%/Firefox Setup 3.0 Beta 4.exe" >+# 2.0.0.14 win32, only locales available for both >+release="2.0.0.14" product="Firefox" platform="WINNT_x86-msvc" build_id="2008040413" locales="af ar be ca cs da de el en-GB es-AR es-ES eu fi fr fy-NL ga-IE gu-IN he hu it ja ka ko ku lt mk mn nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru sk sv-SE tr uk zh-CN zh-TW" channel="majortest" from="/firefox/releases/2.0.0.14/win32/%locale%/Firefox Setup 2.0.0.14.exe" to="/firefox/releases/3.0/win32/%locale%/Firefox Setup 3.0.exe" >Index: tools/patcher-configs/moz18-branch-major-update-patcher2.cfg >=================================================================== >RCS file: /cvsroot/mozilla/tools/patcher-configs/moz18-branch-major-update-patcher2.cfg,v >retrieving revision 1.3 >diff -U50 -r1.3 moz18-branch-major-update-patcher2.cfg >--- tools/patcher-configs/moz18-branch-major-update-patcher2.cfg 17 Mar 2008 20:38:58 -0000 1.3 >+++ tools/patcher-configs/moz18-branch-major-update-patcher2.cfg 27 Jun 2008 20:09:58 -0000 >@@ -1,67 +1,67 @@ > <app Firefox> > > <current-update> >- from = 2.0.0.12 >- to = 3.0b4 >+ from = 2.0.0.14 >+ to = 3.0 > channel = major > testchannel = majortest >- details = "http://%locale%.www.mozilla.com/%locale%/firefox/2.0/details/index.html" >- license = "http://%locale%.www.mozilla.com/%locale%/firefox/2.0/eula/index.html" >+ details = "http://%locale%.www.mozilla.com/%locale%/firefox/3.0/details/index.html" >+ license = "http://%locale%.www.mozilla.com/%locale%/firefox/3.0/eula/index.html" > updateType = major > > <complete> >- path = "firefox-3.0b4.%locale%.%platform%.complete.mar" >- url = "http://stage.mozilla.org/pub/mozilla.org/firefox/releases/3.0b4/update/%platform%/%locale%/firefox-3.0b4.complete.mar" >+ path = "firefox-3.0.%locale%.%platform%.complete.mar" >+ url = "http://stage.mozilla.org/pub/mozilla.org/firefox/releases/3.0/update/%platform%/%locale%/firefox-3.0.complete.mar" > </complete> > <partial> >- path = "firefox-3.0b4.%locale%.%platform%.complete.mar" >- url = "http://stage.mozilla.org/pub/mozilla.org/firefox/releases/3.0b4/update/%platform%/%locale%/firefox-3.0b4.complete.mar" >+ path = "firefox-3.0.%locale%.%platform%.complete.mar" >+ url = "http://stage.mozilla.org/pub/mozilla.org/firefox/releases/3.0/update/%platform%/%locale%/firefox-3.0.complete.mar" > </partial> > </current-update> > >- <release 2.0.0.12> >- version = 2.0.0.12 >- completemarurl= "http://stage.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.12/update/%platform%/%locale%/firefox-2.0.0.12.complete.mar" >+ <release 2.0.0.14> >+ version = 2.0.0.14 >+ completemarurl= "http://stage.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/update/%platform%/%locale%/firefox-2.0.0.14.complete.mar" > > <platforms> >- win32 = 2008020121 >- linux-i686 = 2008020121 >- mac = 2008020121 >+ win32 = 2008040413 >+ linux-i686 = 2008040414 >+ mac = 2008040413 > </platforms> > > locales = af ar be bg ca cs da de el en-GB en-US es-AR es-ES eu fi fr \ > fy-NL ga-IE gu-IN he hu it ja ja-JP-mac ka ko ku lt mk mn nb-NO \ > nl nn-NO pa-IN pl pt-BR pt-PT ro ru sk sl sv-SE tr uk zh-CN zh-TW > > <exceptions> > gu-IN = win32, linux-i686 > ja = win32, linux-i686 > ja-JP-mac = mac > ka = win32, linux-i686 > </exceptions> > </release> > >- <release 3.0b4> >- version = 3.0b4 >- prettyVersion = 3.0 Beta 4 >- extension-version = 3.0b4 >+ <release 3.0> >+ version = 3.0 >+ extension-version = 3.0 > schema = 1 >- completemarurl = "http://stage.mozilla.org/pub/mozilla.org/firefox/releases/3.0b4/update/%platform%/%locale%/firefox-3.0b4.complete.mar" >+ completemarurl = "http://stage.mozilla.org/pub/mozilla.org/firefox/releases/3.0/update/%platform%/%locale%/firefox-3.0.complete.mar" > > <platforms> >- win32 = 2008030714 >- linux-i686 = 2008030318 >- mac = 2008030317 >+ win32 = 2008052906 >+ linux-i686 = 2008052912 >+ mac = 2008061004 > </platforms> > >- locales = ar be ca cs da de el en-GB en-US es-AR es-ES eu fi fr \ >- fy-NL ga-IE gu-IN he hu it ja-JP-mac ja ka ko lt mk nb-NO \ >- nl pa-IN pl pt-BR pt-PT ro ru sk sq sv-SE tr uk zh-CN zh-TW >+ locales = af ar be ca cs da de el en-GB en-US es-AR es-ES eu fi fr \ >+ fy-NL ga-IE gu-IN he hu id it ja-JP-mac ja ka ko ku lt mk mn nb-NO \ >+ nl nn-NO pa-IN pl pt-BR pt-PT ro ru sk sq sr sv-SE tr uk zh-CN zh-TW > > <exceptions> >+ gu-IN = win32, linux-i686 > ja = win32, linux-i686 > ja-JP-mac = mac > </exceptions> > </release> > > </app>

Comment on attachment 327169 [details] [diff] [review] [checked in] patcher and verify configs for 2.0.0.14 ---> 3.0 Checking in testing/release/updates/moz18-firefox-linux-major.cfg; /cvsroot/mozilla/testing/release/updates/moz18-firefox-linux-major.cfg,v <-- moz18-firefox-linux-major.cfg new revision: 1.4; previous revision: 1.3 done Checking in testing/release/updates/moz18-firefox-mac-major.cfg; /cvsroot/mozilla/testing/release/updates/moz18-firefox-mac-major.cfg,v <-- moz18-firefox-mac-major.cfg new revision: 1.3; previous revision: 1.2 done Checking in testing/release/updates/moz18-firefox-win32-major.cfg; /cvsroot/mozilla/testing/release/updates/moz18-firefox-win32-major.cfg,v <-- moz18-firefox-win32-major.cfg new revision: 1.3; previous revision: 1.2 done Checking in tools/patcher-configs/moz18-branch-major-update-patcher2.cfg; /cvsroot/mozilla/tools/patcher-configs/moz18-branch-major-update-patcher2.cfg,v <-- moz18-branch-major-update-patcher2.cfg new revision: 1.4; previous revision: 1.3 done

Logs for the automated verification are at: https://build.mozilla.org/logs/Firefox_2.0.0.14_3.0_MU/ (LDAP auth) Overall it looks fine to me, no regressions from the last test. Comments: * harmless comment change in channel-prefs.js * leftover empty dir trees extensions/inspector@mozilla.org, bin/extensions/talkback@mozilla.org, which are removed on app run * win32 - freebl3.chk and softokn3.chk differ (known, bug 404340) - .autoreg added (ok) - removed-files added (ok) * other leftover files by locale: be: searchplugins/amazondotcom.xml searchplugins/answers.xml searchplugins/creativecommons.xml searchplugins/eBay.xml el: searchplugins/amazondotcom.xml searchplugins/eBay.xml es-AR: searchplugins/answers.xml eu: searchplugins/eBay.xml ko: searchplugins/amazondotcom.xml sv-SE: searchplugins/amazon-en-GB.xml searchplugins/answers.xml searchplugins/eBay-en-GB.xml uk: searchplugins/rambler.xml zh-CN: searchplugins/amazondotcom.xml zh-TW: searchplugins/amazondotcom.xml dictionaries/en-US.aff dictionaries/en-US.dic Axel, how does that look to you ? uk's rambler was a late removal ?

(In reply to comment #60) > Axel, how does that look to you ? uk's rambler was a late removal ? Axel, any update on this?

from comment #60, AFAIK almost all are correct except zh-CN. here are some details: zh-CN: correct to remove amazon, replaced with amazon.cn - see bug 404611 - however in the bug (although not the patch) I have the comment to remove Yahoo and replace with Baidu. I need to double check with Pike on this as I don't see the removal in the patch. Pinged him this morning Correct: be is correct - see bug 388035 for reference el is correct - and just to clarify, these should have been replaced with amazon.co.uk and ebay.co.uk - bug 428010 for reference es-AR is correct - see bug 418306 for reference eu is correct - and to clarify, ebay.com should have been replaced by ebay.es - bug 420679 for reference ko is correct - see bug 407938 for reference sv-SE is correct - see bug 415837 for reference uk is correct - see bug 419019 for reference zh-TW is correct - see bug 418273 for reference

zh-TW is correct. Thanks.^_^

Mic, thanks for taking the time to dig up all that information. Could you confirm that what you mean by "correct" matches up with the following: The comparison of searchplugins in comment #60 is between a Fx2 updated to Fx3, and a Fx3 install. All the search engines listed are only present in the updated copy. We have a technical limitation in not being able to remove a plugin from only a particular locale, eg amazondotcom.xml cannot be removed on update for be, because it's still used by other locales. So there a bunch of amazon's, eBay's etc left there which are shared with en-US etc. Looks like rambler.xml is also used by ru, so that's why it's still there for uk.

Could we get a new set of major updates with the latest builds, from Fx2.0.0.16 to Fx3.0.1, for further testing?

Sure, probably today or tomorrow.

There were no locale changes between 3.0 and 3.0.1 (or 2.0.0.14 and 2.0.0.16), so this is pretty much a version and buildid update.

(In reply to comment #64) > Mic, thanks for taking the time to dig up all that information. Could you > confirm that what you mean by "correct" matches up with the following: > > The comparison of searchplugins in comment #60 is between a Fx2 updated to Fx3, > and a Fx3 install. yes that is what I meant by "correct"

Comment on attachment 333503 [details] [diff] [review] [checked in] patcher and verify configs for 2.0.0.16 ---> 3.0.1 Checking in testing/release/updates/moz18-firefox-linux-major.cfg; /cvsroot/mozilla/testing/release/updates/moz18-firefox-linux-major.cfg,v <-- moz18-firefox-linux-major.cfg new revision: 1.5; previous revision: 1.4 done Checking in testing/release/updates/moz18-firefox-mac-major.cfg; /cvsroot/mozilla/testing/release/updates/moz18-firefox-mac-major.cfg,v <-- moz18-firefox-mac-major.cfg new revision: 1.4; previous revision: 1.3 done Checking in testing/release/updates/moz18-firefox-win32-major.cfg; /cvsroot/mozilla/testing/release/updates/moz18-firefox-win32-major.cfg,v <-- moz18-firefox-win32-major.cfg new revision: 1.4; previous revision: 1.3 done Checking in tools/patcher-configs/moz18-branch-major-update-patcher2.cfg; /cvsroot/mozilla/tools/patcher-configs/moz18-branch-major-update-patcher2.cfg,v <-- moz18-branch-major-update-patcher2.cfg new revision: 1.5; previous revision: 1.4 done Would still appreciate a review.

2.0.0.16 --> 3.0.1 is up on the majortest channel. Logs for the automated verification are at: https://build.mozilla.org/logs/Firefox_2.0.0.16_3.0.1_MU/ (LDAP auth) Overall it looks fine to me, no regressions from the last test, so over to QA.

As far as I know, this bug is complete. All patches have landed and no bugs have been found.