533043 - Use a single preprocessed packaging manifest for all three platforms

Status: RESOLVED FIXED

(Thunderbird :: Build Config, defect, P1)

Description

[Phil Ringnalda (:philor)]

Two primary benefits:

* because Fx uses a manifest on all three platforms, core hackers have no expectation that throwing some random piece of junk in dist/bin will result in it being shipped, while we have no system to ensure we look at and decide whether to unship new pieces of junk thrown in there

* because the patch to link XPTs on OS X without a manifest didn't land on 1.9.2, we would need yet another chunk of ifdef hell in our removed-files.in to deal with linked XPTs in 1.9.1+ on Windows, 1.9.2+ on Linux, and 1.9.3+ on Mac

Comment 1

[Phil Ringnalda (:philor)]

Attachment: WIP v.1

Several more rounds to go, for 1.9.2 and shared and diffing against what we're packaging now, but this gives fairly reasonable package-compare results on 1.9.3 on all three platforms.

Comment 2

[Phil Ringnalda (:philor)]

Attachment: Fix v.1

This seems to work, though package-compare is a bit ugly since for some reason I don't quite get, BINPATH starts with a / on OS X, and I didn't quite figure out how to compare both the stuff above Contents/MacOS/ and the stuff within, but it's still way better than the nothing we have now (as it points out that for some reason, despite the |MOZ_OJI=| in confvars.sh, we're still building OJI).

I've got a little Stockholm Syndrome from spending so much time with it, building six times for every change, so I'll attach the last six package-compares, too.

Comment 3

[Phil Ringnalda (:philor)]

Attachment: package-compares

Comment 4

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

I would appreciate if you could also mind Calendar, as soon as you have the issues sorted out for Tb :)

Comment 5

[Phil Ringnalda (:philor)]

Attachment: Fix v.2

Dolske's been a busy little beaver - added components/crypto-SDR.js from bug 499417.

Comment 6

[Phil Ringnalda (:philor)]

Attachment: Fix v.3

Go go gadget hg pull --rebase, since of course crypto-SDR.js and mozsqlite would need to land and rot the source of my hg mv.

Comment 7

[Phil Ringnalda (:philor)]

Some thoughts on http://build.mozillamessaging.com/buildbot/try/builders/Try%20server%20comm-central%20mac%20hg%20builder/builds/280/steps/package%20compare/logs/stdio and http://build.mozillamessaging.com/buildbot/try/builders/Try%20server%20comm-central%20linux%20hg%20builder/builds/278/steps/package%20compare/logs/stdio and http://build.mozillamessaging.com/buildbot/try/builders/Try%20server%20comm-central%20win32%20hg%20builder/builds/277/steps/package%20compare/logs/stdio

* I forget exactly where, maybe the Fx single-pkg-manifest bug, but Ted fixed Packager.mk to properly deal with recursively copying a directory, so no more foo/* and no more modules/* modules/gloda/* (which is nice, since crashreporter.app/ would get ugly)

* somebody who's probably me should really deal with the way that we build run-mozilla.sh on OS X, where we have absolutely no expectation that it will work or desire to ship it

* I finally got the story on dependentlibs.list, which is a convenience for an XULRunner app which finds you as a GRE and wants to load you up, so once I get done wrestling with the makefile trying to not create it for non-libxul and add it to Fx's manifest, I'll add it to ours in a libxul ifdef to remind us why we're not shipping it

* After I don't know how many times thinking it was an annoying artifact of sort that put bin/icons/updater.png so far away from where I was packaging with *.png, I finally realized that duh, bin/chrome/icons/*.png isn't going to package anything in bin/icons, so I guess I'll be doing another patch once I figure out why Fx is packaging bin/icons/*.xpm when there aren't any

Comment 8

[Phil Ringnalda (:philor)]

Attachment: Fix v.4

With updater.png, and without the redundant isp/@AB_CD@/.

Comment 9

[Phil Ringnalda (:philor)]

Attachment: Fix v.4.0001

Well, the part about isp/@AB_CD@/ would have been true, if I'd remembered to qref.

Comment 10

[Phil Ringnalda (:philor)]

http://hg.mozilla.org/comm-central/rev/c87ebb61ec41

Comment 11

[Mark Banner (:standard8)]

I've just checked in two packaging bustage fixes:

http://hg.mozilla.org/comm-central/rev/a5bd970f674d

Adds * onto the end of directories so that the contents gets packaged on Windows
Also adds thunderbird.xpt onto the removed-files.in list (I suspect this is mac only, and we might want to fix that in a follow-up, however it busted my trunk mac nightly build on update hence I wanted to add it).

http://hg.mozilla.org/comm-central/rev/8cc5f5213941

Adds the two modules/ sub-directories. Apparently recursive packaging doesn't work in windows or not in the way we think it does.

These are quick bustage fixes so that we don't break our builds too badly over Christmas, I'll let Phil work out if they need extra follow-ups or not.

Comment 12

[Phil Ringnalda (:philor)]

Bleah, yeah: I'd forgotten that no-manifest linking uses the app name, since it doesn't have a manifest to get the component name from, so thunderbird.xpt is Mac and Linux. I actually did ask Ted why Fx's manifest uses * sometimes and not others, but neither one of us quite managed to realize that it uses * when it's not a Mac-only thing, and only uses just / in Mac ifdefs.