769130 - browser/app/Makefile.in: setting PREF_JS_EXPORTS _after_ including rules.mk is useless

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Serge Gautherie (:sgautherie)]

(In reply to Mike Hommey [:glandium] from bug 762588 comment #9)
> (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.

Comment 1

[Mike Hommey [:glandium]]

Attachment: Actually install channel-prefs.js in PREF_DIR when building Firefox as a XULRunner app

Comment 2

[Serge Gautherie (:sgautherie)]

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

This looks like what I expected.

Comment 3

[Mike Hommey [:glandium]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/a11422072152

Comment 4

[Mike Hommey [:glandium]]

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

[Approval Request Comment]
Bug caused by bug 762588 and initially bug 756325.
User impact if declined: channel-prefs.js is not shipped at all after bug 762588. (only affects Firefox as a xulrunner application, not mozilla builds, nor local builds)
Risk to taking this patch (and alternatives if risky): NPOTB.
String or UUID changes made by this patch: None.

Comment 5

[Alex Keybl [:akeybl]]

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

[Triage Comment]
NPOTB, approved for Aurora 15 and Beta 14.

Comment 6

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/a11422072152

Comment 7

[Mike Hommey [:glandium]]

http://hg.mozilla.org/releases/mozilla-aurora/rev/5e5ba775818c
http://hg.mozilla.org/releases/mozilla-beta/rev/39f015c65a4b