390361 - Fix FF+XR builds to copy XR to make a complete package

Status: RESOLVED FIXED

Description

[Benjamin Smedberg]

Created attachment 274669 [details] [diff] [review]
FF+XR packaging, rev. 1

Currently when you do a FF+XR build you end up with two objdirs but it's really hard to actually *run* the build because the browser doesn't know where XR is (unless it's globally registered, which is unusual). This patch copies libxul-sdk/bin to the browser dist/bin/xulrunner directory and copies the stub to "firefox.exe".

This won't quite get us to shippable FF+XR builds because I'll need to fix up the packaging manifests, but we're really close!

Comment 1

[Ted Mielczarek [:ted.mielczarek]]

Comment on attachment 274669 [details] [diff] [review]
FF+XR packaging, rev. 1

>Index: browser/app/Makefile.in
> ifeq ($(USE_SHORT_LIBNAME), 1)
> PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
>-else
>+elsev

Typo?

>+ifdef LIBXUL_SDK
>+libs::
>+	cp $(LIBXUL_DIST)/bin/xulrunner-stub$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)

Does this do the right thing on Linux, where 'firefox' is a script and 'firefox-bin' is the binary?

Looks good otherwise, r=me.

Comment 2

[Benjamin Smedberg]

> Does this do the right thing on Linux, where 'firefox' is a script and
> 'firefox-bin' is the binary?

Yes, because in the FF-XR case it's not a script, it's the xulrunner-stub binary

Comment 3

[Benjamin Smedberg]

Fixed on trunk. I'll file a followup on fixing the packaging manifests.

Comment 4

[Serge Gautherie (:sgautherie)]

Comment on attachment 274669 [details] [diff] [review]
FF+XR packaging, rev. 1


http://hg.mozilla.org/mozilla-central/rev/bcd5a603eeaf

Comment 5

[Serge Gautherie (:sgautherie)]

(In reply to comment #3)
> I'll file a followup on fixing the packaging manifests.

Could you add a dependency to that bug? Thanks.