No Bug. fix l10n for SeaMonkey. r=Bustage a=Callek for CLOSED TREE SEA_COMM250_20131016_RELBRANCH SEAMONKEY_2_22b1_BUILD1 SEAMONKEY_2_22b1_RELEASE
authorJustin Wood <Callek@gmail.com>
Thu, 17 Oct 2013 21:43:16 -0400
branchSEA_COMM250_20131016_RELBRANCH
changeset 16327 e70ccff0c10fed75c4393571d92f0247ea4f9719
parent 16325 ff0b7ccbf23c718342fcac8a52141105ff1f05fe
child 16328 5cd5cd89f6f2c71dc887ce8b2ea13487110a5ec7
push id1014
push userCallek@gmail.com
push dateFri, 18 Oct 2013 01:46:07 +0000
treeherdercomm-beta@5cd5cd89f6f2 [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,14 +1,9 @@
-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,14 +1,9 @@
-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,14 +1,9 @@
-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