Bug 1074011 - Thunderbird's preprocessed channel-prefs.js file needs to be the same for each build. r=Standard8. a=Standard8
authorJosiah Bruner <josiah@programmer.net>
Thu, 16 Oct 2014 13:59:53 -0400
changeset 25495 cab722bcb4abdcff3217a6d30e599367560531d8
parent 25494 5da48515537c43099ce571b876a9961b68c4ec50
child 25496 666e076e66ef22df22c29395cfab886cc8ebc427
child 25498 d22cbdff2a6f26d9589c4b052b0e5cae81cf876a
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8, Standard8
bugs1074011
Bug 1074011 - Thunderbird's preprocessed channel-prefs.js file needs to be the same for each build. r=Standard8. a=Standard8
mail/app/Makefile.in
mail/app/profile/channel-prefs.js
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -99,17 +99,17 @@ ifeq ($(OS_ARCH),WINNT)
 $(RESFILE): embedded-icons
 
 endif
 
 ifneq ($(OS_ARCH),WINNT)
 libs::
 	cp -p $(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 
-GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, all.js all-thunderbird.js channel-prefs.js mailnews.js)
+GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, all.js all-thunderbird.js mailnews.js)
 endif # ! WinNT
 
 endif # LIBXUL_SDK
 
 ifneq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
 ICON_SUFFIX=.ico
 
 DESKTOP_ICONS = \
@@ -136,16 +136,23 @@ endif
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 libs::
 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DIST)/bin/chrome/icons/default
 endif
 
 libs:: $(srcdir)/profile/prefs.js
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
 
+ifndef LIBXUL_SDK
+# channel-prefs.js is handled separate from other prefs due to bug 756325
+libs:: $(srcdir)/profile/channel-prefs.js
+	$(NSINSTALL) -D $(DIST)/bin/defaults/pref
+	$(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)
+endif
+
 libs:: $(srcdir)/blocklist.xml
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 
 MAC_APP_NAME = $(MOZ_APP_DISPLAYNAME)
 
 ifdef MOZ_DEBUG
--- a/mail/app/profile/channel-prefs.js
+++ b/mail/app/profile/channel-prefs.js
@@ -1,6 +1,5 @@
-#filter substitution
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 pref("app.update.channel", "@MOZ_UPDATE_CHANNEL@");