Bug 747328 - Don't hard-code the update channel in the nightly mozconfigs. r=jhopkins NPOTB DONTBUILD
authorMark Banner <bugzilla@standard8.plus.com>
Fri, 20 Apr 2012 13:41:32 +0100
changeset 11683 517d82e4b44645383c1bdebbcb42ee32581096b6
parent 11682 950133af840f65c18fec792b3cd10eab7b69db6c
child 11684 52160eb9efd5744bce2e2239855f3afdc54fad04
push idunknown
push userunknown
push dateunknown
reviewersjhopkins
bugs747328
Bug 747328 - Don't hard-code the update channel in the nightly mozconfigs. r=jhopkins NPOTB DONTBUILD
mail/config/mozconfigs/linux32/nightly
mail/config/mozconfigs/linux64/nightly
mail/config/mozconfigs/macosx-universal/nightly
mail/config/mozconfigs/win32/nightly
--- a/mail/config/mozconfigs/linux32/nightly
+++ b/mail/config/mozconfigs/linux32/nightly
@@ -1,11 +1,11 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
 ac_add_options --enable-codesighs
 
 . $topsrcdir/build/unix/mozconfig.linux
 
 # Avoid dependency on libstdc++ 4.5
--- a/mail/config/mozconfigs/linux64/nightly
+++ b/mail/config/mozconfigs/linux64/nightly
@@ -1,11 +1,11 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
 ac_add_options --enable-codesighs
 
 . $topsrcdir/build/unix/mozconfig.linux
 
 # Avoid dependency on libstdc++ 4.5
--- a/mail/config/mozconfigs/macosx-universal/nightly
+++ b/mail/config/mozconfigs/macosx-universal/nightly
@@ -12,17 +12,17 @@ fi
 
 . $topsrcdir/build/macosx/universal/mozconfig
 
 if test -n $oldtopsrcdir; then
   export topsrcdir=$oldtopsrcdir
 fi
 
 ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=nightly
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 ac_add_options --enable-tests
 ac_add_options --enable-codesighs
 ac_add_options --disable-install-strip
 
 export CFLAGS="-gdwarf-2"
--- a/mail/config/mozconfigs/win32/nightly
+++ b/mail/config/mozconfigs/win32/nightly
@@ -1,10 +1,10 @@
 ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=nightly
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 ac_add_options --enable-tests
 
 #Bug 427627
 ac_add_options --enable-jemalloc