Part 6 of "Bug 728930 - Move Mozconfigs into Source Tree" r=KaiRo a=Ratty
authorJustin Wood <Callek@gmail.com>
Tue, 21 Feb 2012 12:20:00 -0500
changeset 11193 f128b236d7b0b49d25b38b9e56f02569e8d9c8cf
parent 11192 d3d5803a732fd0777b9e2a402ef5a7c343cdf539
child 11194 604396ff867c5c826e6343956231e945a1346762
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)
reviewersKaiRo, Ratty
bugs728930
Part 6 of "Bug 728930 - Move Mozconfigs into Source Tree" r=KaiRo a=Ratty make use of MOZ_UPDATE_CHANNEL so that other trains work right.
suite/config/mozconfigs/linux32/nightly
suite/config/mozconfigs/linux64/nightly
suite/config/mozconfigs/macosx-universal/nightly
suite/config/mozconfigs/win32/nightly
--- a/suite/config/mozconfigs/linux32/nightly
+++ b/suite/config/mozconfigs/linux32/nightly
@@ -1,11 +1,11 @@
 ac_add_options --enable-application=suite
 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
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 
--- a/suite/config/mozconfigs/linux64/nightly
+++ b/suite/config/mozconfigs/linux64/nightly
@@ -1,11 +1,11 @@
 ac_add_options --enable-application=suite
 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
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 
--- a/suite/config/mozconfigs/macosx-universal/nightly
+++ b/suite/config/mozconfigs/macosx-universal/nightly
@@ -14,17 +14,17 @@ fi
 
 . $topsrcdir/build/macosx/universal/mozconfig
 
 if test -n $oldtopsrcdir; then
   export topsrcdir=$oldtopsrcdir
 fi
 
 ac_add_options --enable-application=suite
-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-tests
 ac_add_options --enable-codesighs
 ac_add_options --disable-install-strip
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
--- a/suite/config/mozconfigs/win32/nightly
+++ b/suite/config/mozconfigs/win32/nightly
@@ -1,10 +1,10 @@
 ac_add_options --enable-application=suite
-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-jemalloc
 ac_add_options --enable-tests
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Needed to enable breakpad in application.ini