Bug 747328 - Don't hard-code the update channel in the nightly mozconfigs. r=jhopkins,a=Standard8 NPOTB DONTBUILD
authorMark Banner <bugzilla@standard8.plus.com>
Fri, 20 Apr 2012 13:41:32 +0100
changeset 11239 c43089235c4ea18f29a3751941f2ba6f0fd2e1fe
parent 11238 6baac4996dddf9f4815da6114100fae5c9ef3e95
child 11240 b166152a7dd4f1d52ccbbaa94e51a8c1fdc23f3b
push id463
push userbugzilla@standard8.plus.com
push dateTue, 24 Apr 2012 17:34:51 +0000
treeherdercomm-beta@e53588e8f7b0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjhopkins, Standard8
bugs747328
Bug 747328 - Don't hard-code the update channel in the nightly mozconfigs. r=jhopkins,a=Standard8 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