410627 - No complete MARs generated for SeaMonkey Mac L10n builds

Status: RESOLVED FIXED

(SeaMonkey :: Build Config, defect)

Description

[Robert Kaiser]

In the first step for bug 408190 (SeaMonkey AUS work), I realized that the SeaMonkey Mac box generates complete MARs only for en-US, while Linux and Windows boxen generate them for all platforms.

Builds logs show this error (here for de):
------------------------------------------
Generating complete update...
mkdir -p /builds/tinderbox/SeaMonkey-Trunk/Darwin_8.7.2_Depend/mozilla/../build/ppc/dist/install/2008-01-03-01-trunk/build.18854
make -C /builds/tinderbox/SeaMonkey-Trunk/Darwin_8.7.2_Depend/mozilla/../build/ppc/tools/update-packaging full-update STAGE_DIR=/builds/tinderbox/SeaMonkey-Trunk/Darwin_8.7.2_Depend/mozilla/../build/ppc/dist/install/2008-01-03-01-trunk/build.18854 DIST=/builds/tinderbox/SeaMonkey-Trunk/Darwin_8.7.2_Depend/mozilla/../build/ppc/dist/l10n-stage AB_CD=de
mkdir -p /builds/tinderbox/SeaMonkey-Trunk/Darwin_8.7.2_Depend/mozilla/../build/ppc/dist/install/2008-01-03-01-trunk/build.18854
MAR=/builds/tinderbox/SeaMonkey-Trunk/Darwin_8.7.2_Depend/mozilla/../build/ppc/dist/l10n-stage/host/bin/mar \
  /builds/tinderbox/SeaMonkey-Trunk/Darwin_8.7.2_Depend/mozilla/tools/update-packaging/make_full_update.sh \
  "/builds/tinderbox/SeaMonkey-Trunk/Darwin_8.7.2_Depend/mozilla/../build/ppc/dist/install/2008-01-03-01-trunk/build.18854/seamonkey-2.0a1pre.de.mac.complete.mar" \
  "/builds/tinderbox/SeaMonkey-Trunk/Darwin_8.7.2_Depend/mozilla/../build/ppc/dist/l10n-stage/universal/seamonkey/SeaMonkey.app"
/builds/tinderbox/SeaMonkey-Trunk/Darwin_8.7.2_Depend/mozilla/tools/update-packaging/make_full_update.sh: line 42: pushd: /builds/tinderbox/SeaMonkey-Trunk/Darwin_8.7.2_Depend/mozilla/../build/ppc/dist/l10n-stage/universal/seamonkey/SeaMonkey.app: No such file or directory
NEXT ERROR make: *** [complete-patch] Error 1
No MAR file found matching '/builds/tinderbox/SeaMonkey-Trunk/Darwin_8.7.2_Depend/mozilla/../build/ppc/dist/install/2008-01-03-01-trunk/build.18854/*.mar', update generation failed.
busted.
------------------------------------------

The problem seems to be the additional "universal/" dir that is not present for l10n-stage but inserted by http://bonsai.mozilla.org/cvsblame.cgi?file=/mozilla/tools/update-packaging/Makefile.in&rev=&cvsroot=/cvsroot&mark=54#53

SeaMonkey runs into that, because unlike Firefox or others, we do L10n repackaging on the main tinderboxen, the Mac one of which is configured to do universal builds (FF & Co. repackage their uni builds on separate boxen that are not configured for building uni).

In a similar manner to the patch in bug 391656, we also need a fix here that ignores universal builds for L10n repackaging - but only there, as the main build locale (i.e. en-US) still needs to use the universal dir.

Comment 1

[Robert Kaiser]

Attachment: don't add "universal" if DIST is a l10n-stage

This patch makes us not use the universal/ subdir if we are handling a L10n repackaging build, detected by it being in a /l10n-stage directory.

Comment 2

[Robert Kaiser]

(In reply to comment #0)
> [...], while Linux and
> Windows boxen generate them for all platforms.

for all _locales_ that is, BTW ;-)

Comment 3

[Robert Kaiser]

Comment on attachment 296462 [details] [diff] [review]
don't add "universal" if DIST is a l10n-stage

rhelmer asked on IRC to forward this to someone who know the L10n build stuff better...

Benjamin, SeaMonkey is running into this problem because it has the UNIVERSAL_BINARY flag set, while other app don't have it, doing L10n repackaging on different machines as the main builds.
We need to have the universal/ path for the en-US builds, while L10n repack builds, which are in /l10n-stage dirs, don't have that subdir.

Comment 4

[Benjamin Smedberg]

Robert, this seems fragile. Could you simply un-set UNIVERSAL_BINARY in the cases you care about somewher?

Comment 5

[Robert Kaiser]

I'm trying the following:

Index: mozilla/tools/tinderbox-configs/seamonkey/macosx/tinder-config.pl
===================================================================
+$BuildLocalesArgs = "UNIVERSAL_BINARY=";  # Extra attributes to add to the makefile command
+                                          # which builds the "installers-<locale>" target.

If it works, we can obsolete this patch.

Comment 6

[Robert Kaiser]

Hrm, this does not work. The actual call we're looking for here is http://mxr.mozilla.org/mozilla/source/tools/tinderbox/post-mozilla-rel.pl#646 which is unfortunately the same for both en-US and localized builds, so if we don't go with the patch here, we need to patch tinderbox itself to do the same, with the only difference that we can determine un-setting UNIVERSAL_BINARY by locale code.
I tend to think though that the patch here is the better solution, even if both solutions are a bit hacky.

Comment 7

[Robert Kaiser]

This bug is also the reason for empty build.* subdirectories appearing in all mac trunk nightly directories for SeaMonkey, as well as the copies of those accumulating in latest-trunk/

Comment 8

[Benjamin Smedberg]

Comment on attachment 296462 [details] [diff] [review]
don't add "universal" if DIST is a l10n-stage

Have I mentioned how absolutely fucking ridiculous our packaging systems have become. Need to revamp in moz2!

Comment 9

[Robert Helmer [:rhelmer]]

This looks ok to land, we'll need to keep an eye out that Firefox/Thunderbird/Sunbird nightlies and releases continue to work ok on Mac.

Comment 10

[Robert Kaiser]

Thanks, landed on trunk.

Benjamin, I agree that rework of that stuff should be done, some improvements will already be achieved when building universal binaries moves to a more sane solution - for now, we unfortunately have to live with those dirty nested ifdefs. I'm probably as unhappy with this as you are...