762588 - channel-prefs.js is at the wrong location in FF-on-XR setups

Status: RESOLVED FIXED

Description

[Mike Hommey [:glandium]]

In Xulrunner applications, the defaults/pref/ directory under the application directory is not used for preferences, which means channel-prefs.js, being installed there unconditionally, is never going to be read.

Comment 1

[Mike Hommey [:glandium]]

Created attachment 631062 [details] [diff] [review]
Install channel-prefs.js in PREF_DIR when building Firefox as a XULRunner app

Comment 2

[Robert Strong [:rstrong] (use needinfo to contact me)]

FYI: The changes that caused this bug also landed on Aurora and are on beta as well now.

Comment 3

[Mike Hommey [:glandium]]

(In reply to Robert Strong [:rstrong] (do not email) from comment #2)
> FYI: The changes that caused this bug also landed on Aurora and are on beta
> as well now.

Which is why I had set status-firefox14: affected :)

Comment 4

[Mike Hommey [:glandium]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/22a835a8a15f

Comment 5

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/22a835a8a15f

Comment 6

[Mike Hommey [:glandium]]

Comment on attachment 631062 [details] [diff] [review]
Install channel-prefs.js in PREF_DIR when building Firefox as a XULRunner app

[Approval Request Comment]
Bug caused by bug 756325, which was a late landing on aurora (a few days before beta merge).
User impact if declined: Only a problem for people building firefox as a xulrunner application.
Risk to taking this patch (and alternatives if risky): The patch doesn't change anything for mozilla builds.

Comment 7

[Mike Hommey [:glandium]]

http://hg.mozilla.org/releases/mozilla-aurora/rev/b41fcee639da
http://hg.mozilla.org/releases/mozilla-beta/rev/90a5cad9b438

Comment 8

[Serge Gautherie (:sgautherie)]

Comment on attachment 631062 [details] [diff] [review]
Install channel-prefs.js in PREF_DIR when building Firefox as a XULRunner app

Review of attachment 631062 [details] [diff] [review]:
-----------------------------------------------------------------

::: browser/app/Makefile.in
@@ +142,5 @@
>  libs:: $(srcdir)/profile/channel-prefs.js
>  	$(NSINSTALL) -D $(DIST)/bin/defaults/pref
>  	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PREF_PPFLAGS) $(ACDEFINES) $^ > $(DIST)/bin/defaults/pref/channel-prefs.js
> +else
> +PREF_JS_EXPORTS += $(srcdir)/profile/channel-prefs.js

I'm a little confused.
Isn't it useless to set PREF_JS_EXPORTS _after_ including rules.mk?
http://mxr.mozilla.org/comm-central/search?string=PREF_JS_EXPORTS&case=on

Comment 9

[Mike Hommey [:glandium]]

(In reply to Serge Gautherie (:sgautherie) from comment #8)
> Comment on attachment 631062 [details] [diff] [review]
> Install channel-prefs.js in PREF_DIR when building Firefox as a XULRunner app
> 
> Review of attachment 631062 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: browser/app/Makefile.in
> @@ +142,5 @@
> >  libs:: $(srcdir)/profile/channel-prefs.js
> >  	$(NSINSTALL) -D $(DIST)/bin/defaults/pref
> >  	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PREF_PPFLAGS) $(ACDEFINES) $^ > $(DIST)/bin/defaults/pref/channel-prefs.js
> > +else
> > +PREF_JS_EXPORTS += $(srcdir)/profile/channel-prefs.js
> 
> I'm a little confused.
> Isn't it useless to set PREF_JS_EXPORTS _after_ including rules.mk?
> http://mxr.mozilla.org/comm-central/search?string=PREF_JS_EXPORTS&case=on

Mmmm you're right. Can you file a followup bug?

Comment 10

[Serge Gautherie (:sgautherie)]

(In reply to Mike Hommey [:glandium] from comment #9)
> Can you file a followup bug?

Bug 769130 Submitted