Closed Bug 385281 Opened 19 years ago Closed 19 years ago

generate one-off CJKT MARs for 1.5.0.12->2.0.0.4 major update

Categories

(Release Engineering :: General, defect, P1)

defect

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: rhelmer, Assigned: rhelmer)

Details

Attachments

(3 files, 2 obsolete files)

We need to generate custom MARs for 1.5.0.12->2.0.0.4 major update, for CJKT locales only.
Assignee: build → rhelmer
Status: ASSIGNED → NEW
Priority: -- → P3
changed to p1
Priority: P3 → P1
To answer some questions for people: * We do not want to force a change of defaults during major update for CJKT 1.5 users who currently have Yahoo as default search and homepage provider * We had code to override defaults, which was slightly flawed and removed the localized pref overrides in bug 380429, by which time nearly all 2.0 branch users would have picked up the overrides in going to 2.0.0.2/2.0.0.3 * To resolve this in the major update case, we will need to re-include the existing-profile-defaults.js files that were removed from 2.0.0.4 in the repacked MARs in the correct location (not 100% sure where that is, checking the full MARs for 2.0.0.2 should tell the tale). These files were removed from l10n CVS from the following locations (based on the diff in the removal bug): ja/browser/existing-profile-defaults.js ja-JP-mac/browser/existing-profile-defaults.js ko/browser/existing-profile-defaults.js zh-TW/browser/existing-profile-defaults.js zh-CN/browser/existing-profile-defaults.js * We may also want to offer the same full MARs to 2.0/2.0.0.1 users, but that is a secondary consideration, and is not a priority at this time (need AUS stats for users still on the older versions)
Gavin clarified an important point here for me.. for each locale, the "existing-profile-defaults.js" needs to go into defaults/pref/ as per http://lxr.mozilla.org/seamonkey/source/browser/locales/Makefile.in#91 So for the new MARs, there will be one new "add" entry in the update.manifest, and this new (locale-specific) file. Otherwise, the new MARs will have the same contents as the shipped 2.0.0.4 MARs.
Status: NEW → ASSIGNED
(In reply to comment #3) > Gavin clarified an important point here for me.. for each locale, the > "existing-profile-defaults.js" needs to go into defaults/pref/ as per > http://lxr.mozilla.org/seamonkey/source/browser/locales/Makefile.in#91 Sorry, above is wrong.. each goes into "defaults/" not "defaults/pref/" > > So for the new MARs, there will be one new "add" entry in the update.manifest, > and this new (locale-specific) file. Otherwise, the new MARs will have the same > contents as the shipped 2.0.0.4 MARs. >
(In reply to comment #2) > ja/browser/existing-profile-defaults.js > ja-JP-mac/browser/existing-profile-defaults.js > ko/browser/existing-profile-defaults.js > zh-TW/browser/existing-profile-defaults.js > zh-CN/browser/existing-profile-defaults.js What revision of these files do I need to pull? The versions tagged with FIREFOX_2_0_0_3_RELEASE, or something else? gavin says via irc that you or he should check to make sure they are relevant to 1.5, so I'll let him comment further if needed.
Attachment #269271 - Attachment description: existing-profile-defaults.js files, from FIREFOX_2_0 → existing-profile-defaults.js files, from FIREFOX_2_0_0_4_RELEASE
Attached file repack mars script (obsolete) —
Hey bsmedberg, look familiar? :) This is based on the script you made a few releases back that we didn't end up using. I've made it a little more generic, it now takes 4 params: <mar_file_in> <mar_file_out> <manifest_file> <new_app_dir> The contents of manifest_file are prepended to the existing manifest file in mar_file_in. The contents of new_app_dir are overlayed into the work area that'll be used to make the new MAR. Example usage: ./repack_mars.py `pwd`/orig/linux-i686/ja/firefox-2.0.0.4.complete.mar `pwd/repacked/linux-i686/ja/firefox-2.0.0.4-2.complete.mar `pwd`/contents/manifest `pwd`/contents/ja/defaults The manifest file simply contains: add "defaults/existing-profile-defaults.js" I plan to write a little script to loop over all OSes and locales, and call repack_mars.py appropriately for each. I stuck a FIXME in there that the script should be able to merge the manifest file with the existing ones (e.g. do not duplicate entries), but this isn't an issue for right now so I've left that alone.
Attachment #269273 - Flags: review?
Attachment #269273 - Attachment mime type: text/x-python → text/plain
Attachment #269273 - Flags: review? → review?(benjamin)
Attachment #269271 - Attachment description: existing-profile-defaults.js files, from FIREFOX_2_0_0_4_RELEASE → existing-profile-defaults.js files, from FIREFOX_2_0_0_3_RELEASE
Sorry this one's a little hacked up, I put in an explicit remove and did some special-casing for Mac.
Attachment #269273 - Attachment is obsolete: true
Attachment #269318 - Flags: review?(benjamin)
Attachment #269273 - Flags: review?(benjamin)
Attachment #269318 - Attachment mime type: text/x-python → text/plain
Attachment #269319 - Attachment mime type: application/x-shellscript → text/plain
Comment on attachment 269318 [details] Mac workarounds, and support removing "remove" instruction > for line in oldManifest.split("\n"): > if line == 'remove "defaults/existing-profile-defaults.js"': > continue > if line == 'remove "Contents/MacOS/defaults/existing-profile-defaults.js"': > continue > manifest += line + "\n" 1) I'm a little worried about the split('\n') because of windows line-endings... please make sure those are correct, and/or You can be more pythonistic here manifest = "\n|.join([line for line in oldManifest.split("\n") if !line.endswith("defaults/existing-profile-defaults.js")]) > # FIXME - should not add duplicate manifest statements > manifest = "".join(["%(instruction)s" % > {'instruction': instruction, 'prefix': prefix} > for instruction in manifestlist]) + manifest I don't understand what "prefix" is doing: you don't seem to be using it.
Attachment #269318 - Flags: review?(benjamin) → review-
(In reply to comment #11) > (From update of attachment 269318 [details]) > > for line in oldManifest.split("\n"): > > if line == 'remove "defaults/existing-profile-defaults.js"': > > continue > > if line == 'remove "Contents/MacOS/defaults/existing-profile-defaults.js"': > > continue > > manifest += line + "\n" > > 1) I'm a little worried about the split('\n') because of windows > line-endings... please make sure those are correct, and/or > You can be more pythonistic here > > manifest = "\n|.join([line for line in oldManifest.split("\n") > if > !line.endswith("defaults/existing-profile-defaults.js")]) It seems to be \n and seems to work ok, but I'll double-check, and make the change you suggest. > > # FIXME - should not add duplicate manifest statements > > manifest = "".join(["%(instruction)s" % > > {'instruction': instruction, 'prefix': prefix} > > for instruction in manifestlist]) + manifest > > I don't understand what "prefix" is doing: you don't seem to be using it. It's vestigial; I'll remove it.
Done, shipped!
Status: ASSIGNED → RESOLVED
Closed: 19 years ago
Resolution: --- → FIXED
thank you, thank you, thank you to everyone involved, especially in QA/test, and build!
QA sees yahoo zhTW and zhCN partner builds to show Google Search plugin after major update from 1.5.0.12 -> 2.0.0.4. Home page remains yahoo search, but plugin has changed.
This was tested against "betatest-yahoo" channel.
Product: mozilla.org → Release Engineering
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: