Add --enable-update-channel for browser+mail. Bug 302721, attachment

193749.  r=bryner@brianryner.com, sr=benjamin@smedbergs.us

browser/app/Makefile.in

@@ -48,7 +48,9 @@ MOZILLA_INTERNAL_API = 1
 
 DIRS		= profile/extensions
 
-PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js
+PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \
+		  $(srcdir)/profile/channel-prefs.js \
+		  $(NULL)
 
 # hardcode en-US for the moment
 AB_CD = en-US

browser/app/profile/channel-prefs.js

@@ -0,0 +1,2 @@
+#filter substitution
+pref("app.update.channel", "@MOZ_UPDATE_CHANNEL@");

browser/installer/unix/packages-static

@@ -220,6 +220,7 @@ bin/icons/*.png
 ; [Default Preferences]
 ; All the pref files must be part of base to prevent migration bugs
 bin/defaults/pref/firefox.js
+bin/defaults/pref/channel-prefs.js
 bin/greprefs/all.js
 bin/greprefs/security-prefs.js
 bin/greprefs/xpinstall.js

browser/installer/windows/packages-static

@@ -209,6 +209,7 @@ bin\chrome\toolkit.manifest
 ; [Default Preferences]
 ; All the pref files must be part of base to prevent migration bugs
 bin\defaults\pref\firefox.js
+bin\defaults\pref\channel-prefs.js
 bin\greprefs\all.js
 bin\greprefs\security-prefs.js
 bin\greprefs\xpinstall.js

configure.in

@@ -5010,6 +5010,17 @@ case "$target_os" in
 esac
 AC_SUBST(MOZ_UPDATER)
 
+# app update channel is 'default' when not supplied.
+MOZ_ARG_ENABLE_STRING([update-channel],
+[  --enable-update-channel=CHANNEL
+                           Select application update channel (default=default)],
+    MOZ_UPDATE_CHANNEL=`echo $enableval | tr A-Z a-z`)
+
+if test -z "$MOZ_UPDATE_CHANNEL"; then
+    MOZ_UPDATE_CHANNEL=default
+fi
+AC_DEFINE_UNQUOTED(MOZ_UPDATE_CHANNEL, $MOZ_UPDATE_CHANNEL)
+
 # tools/update-packaging is not checked out by default.
 MOZ_ARG_ENABLE_BOOL(update-packaging,
 [  --enable-update-packaging

mail/app/Makefile.in

@@ -52,6 +52,7 @@ DIRS		= profile
 
 PREF_JS_EXPORTS = \
     $(srcdir)/profile/all-thunderbird.js \
+    $(srcdir)/profile/channel-prefs.js \
     $(NULL)
 
 ifeq ($(USE_SHORT_LIBNAME), 1)
@@ -255,7 +256,7 @@ install:: thunderbird
 	$(SYSINSTALL) $< $(DESTDIR)$(bindir)
 
 GARBAGE += thunderbird
-GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, all.js all-thunderbird.js mailnews.js)
+GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, all.js all-thunderbird.js channel-prefs.js mailnews.js)
 endif
 
 ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))

mail/app/profile/channel-prefs.js

@@ -0,0 +1,2 @@
+#filter substitution
+pref("app.update.channel", "@MOZ_UPDATE_CHANNEL@");