No Bug. fix l10n for SeaMonkey. r=Bustage a=Callek for CLOSED TREE
authorJustin Wood <Callek@gmail.com>
Thu, 17 Oct 2013 21:43:16 -0400
changeset 13183 931738e67928fad4d3cdad2a637549954a0b8a0d
parent 13182 4d44e8ad55b8d943b273e987e4c6e17b35a77f0d
child 13184 0d7e70096da7958ab18b91f673e4e2cdc9b72f9b
push id9585
push userCallek@gmail.com
push dateTue, 22 Oct 2013 03:44:10 +0000
treeherdercomm-central@931738e67928 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersBustage, Callek
No Bug. fix l10n for SeaMonkey. r=Bustage a=Callek for CLOSED TREE
suite/config/mozconfigs/linux32/release-l10n
suite/config/mozconfigs/linux64/release-l10n
suite/config/mozconfigs/macosx-universal/release-l10n
suite/config/mozconfigs/win32/release-l10n
--- a/suite/config/mozconfigs/linux32/release-l10n
+++ b/suite/config/mozconfigs/linux32/release-l10n
@@ -1,16 +1,11 @@
 . "$topsrcdir/build/mozconfig.common"
 
-if [ "$MOZ_UPDATE_CHANNEL" == "beta" ]; then
-  ac_add_options --with-l10n-base=../../releases/l10n/mozilla-beta
-fi;
-if [ "$MOZ_UPDATE_CHANNEL" == "release" ]; then
-  ac_add_options --with-l10n-base=../../releases/l10n/mozilla-release
-fi;
+ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --enable-stdcxx-compat
 
 
 # Temporary options until bug 794378 is fixed.
--- a/suite/config/mozconfigs/linux64/release-l10n
+++ b/suite/config/mozconfigs/linux64/release-l10n
@@ -1,16 +1,11 @@
 . "$topsrcdir/build/mozconfig.common"
 
-if [ "$MOZ_UPDATE_CHANNEL" == "beta" ]; then
-  ac_add_options --with-l10n-base=../../releases/l10n/mozilla-beta
-fi;
-if [ "$MOZ_UPDATE_CHANNEL" == "release" ]; then
-  ac_add_options --with-l10n-base=../../releases/l10n/mozilla-release
-fi;
+ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-stdcxx-compat
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
--- a/suite/config/mozconfigs/macosx-universal/release-l10n
+++ b/suite/config/mozconfigs/macosx-universal/release-l10n
@@ -1,25 +1,9 @@
-# Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-# mixed up with host/target CPUs when trying to work out how to do the
-# universal build. When we redo the build system (bug 648979) this will
-# go away.
-if test -e "$topsrcdir/suite/config/version.txt"; then
-  unset CC
-  unset CXX
-fi
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-if [ "$MOZ_UPDATE_CHANNEL" == "beta" ]; then
-  ac_add_options --with-l10n-base=../../releases/l10n/mozilla-beta
-fi;
-if [ "$MOZ_UPDATE_CHANNEL" == "release" ]; then
-  ac_add_options --with-l10n-base=../../releases/l10n/mozilla-release
-fi;
+ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
--- a/suite/config/mozconfigs/win32/release-l10n
+++ b/suite/config/mozconfigs/win32/release-l10n
@@ -1,16 +1,11 @@
 . "$topsrcdir/build/mozconfig.common"
 
-if [ "$MOZ_UPDATE_CHANNEL" == "beta" ]; then
-  ac_add_options --with-l10n-base=../../releases/l10n/mozilla-beta
-fi;
-if [ "$MOZ_UPDATE_CHANNEL" == "release" ]; then
-  ac_add_options --with-l10n-base=../../releases/l10n/mozilla-release
-fi;
+ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Needed to enable breakpad in application.ini