715089 - run-mozilla.sh doesn't need to be shipped for Mac

Status: RESOLVED FIXED

(Firefox Build System :: General, enhancement)

Description

[Mark Banner (:standard8)]

Attachment: Proof-of-concept

Currently Thunderbird doesn't ship run-mozilla.sh on Mac, I believe that Firefox doesn't need to ship it either due to the recent changes that stopped shipping 'firefox' as a script (and possibly before then).

The only items that we currently have in-tree that use run-mozilla.sh are ones seeded from RUN_TEST_PROGRAM and they are only really required to set DYLD_LIBRARY_PATH.

Therefore I think we should stop shipping run-mozilla.sh on Mac (we can possibly do that on Linux as well, but lets leave that for another bug as TB still needs it there ;-) )

I'm attaching a proof-of-concept patch - it fails in packaging on Mac, but verification locally indicates that it works.

Ted said that he'd prefer the work of setting the DYLD_LIBRARY_PATH pushed down to the harnesses rather than the individual test definitions.

I've not got time to complete this at the moment, so if anyone wants to take it feel free.

Comment 1

[Serge Gautherie (:sgautherie)]

(In reply to Mark Banner (:standard8) from comment #0)

> Currently Thunderbird doesn't ship run-mozilla.sh on Mac

SeaMonkey doesn't either.

> I'm attaching a proof-of-concept patch - it fails in packaging on Mac, but
> verification locally indicates that it works.

Would
{
/toolkit/mozapps/installer/packager.mk
    * line 580 -- SIGN_CMD = $(NATIVE_DIST)/bin/run-mozilla.sh $(NATIVE_DIST)/bin/shlibsign -v -i
}
be failing due to your change in /build/unix/Makefile.in?

Comment 2

[Mark Banner (:standard8)]

Attachment: Don't ship run-mozilla.sh on Mac

Rather than attempting to completely get rid of run-mozilla.sh, I'm just going with the option of not shipping it on Mac as we no longer need it there. This try run includes a selection of tests that show we don't need it for testing purposes:

https://tbpl.mozilla.org/?tree=Try&rev=fabc1897179b

I'll file a bug for replacing run-mozilla.sh with rpath or something else on Mac & Linux (and then removing it completely on Linux) if this gets accepted.

Comment 3

[(not currently active) Ted Mielczarek]

We don't need run-mozilla.sh for running firefox anymore, but we currently use it for C++ unit tests and a few other things. My patch in bug 787176 will remove the use of it for C++ unit tests, so there are probably only a few uses left in the tree: maybe things running xpcshell or the js shell? We should be able to fix xpcshell pretty easily, probably js shell as well.

Comment 4

[Mark Banner (:standard8)]

(In reply to Ted Mielczarek [:ted] from comment #3)
> We don't need run-mozilla.sh for running firefox anymore, but we currently
> use it for C++ unit tests and a few other things. My patch in bug 787176
> will remove the use of it for C++ unit tests, so there are probably only a
> few uses left in the tree: maybe things running xpcshell or the js shell?

It is basically just replacing places where RUN_TEST_PROGRAM is used - which is c++, xpcshell and js.

This patch was more for getting Firefox in sync with TB & SM on Mac that already don't ship run-mozilla.sh.

Comment 5

[(not currently active) Ted Mielczarek]

My bug archaeology is failing me here, bug 549246 doesn't say whether we actually needed run-mozilla.sh or not. The comments indicate that we only broke things that were looking for the "firefox" binary, not the run-mozilla.sh script.

Comment 6

[Mark Banner (:standard8)]

(In reply to Ted Mielczarek [:ted] from comment #5)
> My bug archaeology is failing me here, bug 549246 doesn't say whether we
> actually needed run-mozilla.sh or not. The comments indicate that we only
> broke things that were looking for the "firefox" binary, not the
> run-mozilla.sh script.

At the time "firefox" was still the script, not a binary.

Comment 7

[Mark Banner (:standard8)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/4d5778af07ba

Comment 8

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/4d5778af07ba