Mac v2 signing - Bug 1070863 - The preprocessed channel-prefs.js file needs to be the same for each build.
authorRobert Strong <robert.bugzilla@gmail.com>
Mon, 22 Sep 2014 10:27:38 -0700
changeset 491273 ee69b981715cccd26b99226a7685336e0fd864db
parent 491272 c5db0f1fc0227754e41609f340575ca364846844
child 491274 ab7770c47443f9bbcb45297e28564046a7e1140e
push id47343
push userbmo:dothayer@mozilla.com
push dateWed, 01 Mar 2017 22:58:58 +0000
bugs1070863
milestone35.0a1
Mac v2 signing - Bug 1070863 - The preprocessed channel-prefs.js file needs to be the same for each build.
browser/app/Makefile.in
browser/app/profile/channel-prefs.js
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -71,17 +71,17 @@ endif
 
 libs:: $(srcdir)/profile/prefs.js
 	$(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/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,$(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)
+	$(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)
 endif
 
 libs:: $(srcdir)/blocklist.xml
 	$(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 
 MAC_APP_NAME = $(MOZ_APP_DISPLAYNAME)
--- a/browser/app/profile/channel-prefs.js
+++ b/browser/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@");