nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

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

Browse source 
193749.  r=bryner@brianryner.com, sr=benjamin@smedbergs.us
This commit is contained in:
cmp%mozilla.org 2005-08-25 00:59:09 +00:00
parent 154d3f15fa
commit 78ebced36f
7 changed files with 22 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
browser/app/Makefile.in
View file

@ -48,7 +48,9 @@ MOZILLA_INTERNAL_API = 1
DIRS = profile/extensions 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 # hardcode en-US for the moment
AB_CD = en-US AB_CD = en-US

2
browser/app/profile/channel-prefs.js Executable file
View file

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

1
browser/installer/unix/packages-static
View file

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

1
browser/installer/windows/packages-static
View file

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

11
configure.in
View file

@ -5010,6 +5010,17 @@ case "$target_os" in
esac esac
AC_SUBST(MOZ_UPDATER) 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. # tools/update-packaging is not checked out by default.
MOZ_ARG_ENABLE_BOOL(update-packaging, MOZ_ARG_ENABLE_BOOL(update-packaging,
[ --enable-update-packaging [ --enable-update-packaging

3
mail/app/Makefile.in
View file

@ -52,6 +52,7 @@ DIRS = profile
PREF_JS_EXPORTS = \ PREF_JS_EXPORTS = \
$(srcdir)/profile/all-thunderbird.js \ $(srcdir)/profile/all-thunderbird.js \
$(srcdir)/profile/channel-prefs.js \
$(NULL) $(NULL)
ifeq ($(USE_SHORT_LIBNAME), 1) ifeq ($(USE_SHORT_LIBNAME), 1)
@ -255,7 +256,7 @@ install:: thunderbird
$(SYSINSTALL) $< $(DESTDIR)$(bindir) $(SYSINSTALL) $< $(DESTDIR)$(bindir)
GARBAGE += thunderbird 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 endif
ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))

2
mail/app/profile/channel-prefs.js Normal file
View file

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