586190 - Mac Chatzilla manifest is different causing unify to fail, and mac builds to be red.

Status: RESOLVED FIXED

(SeaMonkey :: Build Config, defect)

Description

[Justin Wood (:Callek)]

The mac builds of SeaMonkey are failing due to chatzilla not building correctly on both arch's. I logged into our mac builder and diff'd the two files. [note that unify sorts the files first]

--- objdir/ppc/mozilla/dist/seamonkey/SeaMonkey.app/Contents/MacOS/extensions/{59c81df5-4b7a-477b-91
2d-4e0fdf64e5f2}/chrome.manifest        2010-08-10 19:00:26.000000000 -0700
+++ objdir/i386/mozilla/dist/seamonkey/SeaMonkey.app/Contents/MacOS/extensions/{59c81df5-4b7a-477b-9
12d-4e0fdf64e5f2}/chrome.manifest       2010-08-10 19:00:36.000000000 -0700
@@ -5,22 +5,21 @@
 contract @mozilla.org/network/protocol;1?name=irc {f21c35f4-1dd1-11b2-a503-9bf8a539ea39}
 overlay chrome://browser/content/browser.xul chrome://chatzilla/content/browserOverlay.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 contract @mozilla.org/network/protocol;1?name=ircs {f21c35f4-1dd1-11b2-a503-9bf8a539ea39}
 overlay chrome://songbird/content/xul/layoutBaseOverlay.xul chrome://chatzilla/content/browserOverlay.xul application=[e-mail]
 component {38a95514-1dd2-11b2-97e7-9da958640f2c} components/chatzilla-service.js
 content chatzilla-sm jar:chrome/chatzilla.jar!/content/chatzilla/sm/
 overlay chrome://communicator/content/pref/preferences.xul chrome://chatzilla/content/prefsOverlay.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 style   chrome://global/content/customizeToolbar.xul chrome://chatzilla/skin/browserOverlay.css
+overlay chrome://browser/content/browser.xul chrome://chatzilla/content/browserOverlay.xul application={a463f10c-3994-11da-9945-000d60ca027b}
 content chatzilla            jar:chrome/chatzilla.jar!/content/chatzilla/
-content chatzilla-ff jar:chrome/chatzilla.jar!/content/chatzilla/ff/
 overlay chrome://communicator/content/pref/pref-appearance.xul chrome://chatzilla/content/prefsOverlay.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 contract @mozilla.org/commandlinehandler/general-startup;1?type=chat {38a95514-1dd2-11b2-97e7-9da958640f2c}
 overlay chrome://editor/content/editorTasksOverlay.xul chrome://chatzilla/content/chatzillaOverlay.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 skin    chatzilla modern/1.0 jar:chrome/chatzilla.jar!/skin/modern/chatzilla/
-manifest chrome/chatzilla.manifest
-overlay chrome://browser/content/browser.xul chrome://chatzilla/content/browserOverlay.xul application={a463f10c-3994-11da-9945-000d60ca027b}
+content chatzilla-ff jar:chrome/chatzilla.jar!/content/chatzilla/ff/
 locale chatzilla en-US jar:chrome/chatzilla.jar!/locale/en-US/chatzilla/
 overlay chrome://chatzilla/content/menus.xul chrome://communicator/content/tasksOverlay.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 category command-line-handler m-irc @mozilla.org/commandlinehandler/general-startup;1?type=chat
 style   chrome://songbird/content/xul/layoutBaseOverlay.xul chrome://chatzilla/skin/browserOverlay.css
 overlay chrome://chatzilla/content/chatzilla.xul chrome://communicator/content/utilityOverlay.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 overlay chrome://navigator/content/navigator.xul chrome://chatzilla/content/browserOverlay.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}

Which means that ONLY ppc is getting the |manifest chrome/chatzilla.manifest| line somehow, which looks inherently wrong anyway.  I did not yet investigate more.

Comment 1

[Robert Kaiser]

It worked after a clobber once and then failed again, which smells funny.

Comment 2

[[e-mail]]

Sounds like a race condition between the various jar.mn files...

Comment 3

[Robert Kaiser]

Attachment: don't use BOTH_MANIFESTS for real extensions

I think removing BOTH_MANIFESTS for the real extensions should do the trick. On a local L10n build, both the ChatZilla packages as well as the ChatZilla L10n pack look good on manifest inspection with this patch applied.

Comment 4

[Robert Kaiser]

Markings as blocking as it's bustage.

Comment 5

[Robert Kaiser]

Pushed as http://hg.mozilla.org/comm-central/rev/8aa03e83218c - waiting for builds to see if things clear up. Probably will need a few builds to verify as first we need to clean chatzilla on all slaves to get the line removed.

Comment 6

[Robert Kaiser]

Urgh, I messed up the patch and Neil also didn't spot that I deleted those semicolons that still are needed.
Fixed in http://hg.mozilla.org/comm-central/rev/f9f4b09d470d

Comment 7

[Robert Kaiser]

It looks very much like this fixed it, and that also means that this is not a ChatZilla bug after all but a SeaMonkey one.