Bug 774947 - Updated mozconfigs for l10n (NPOTB) - r=aki, a=lsblakk
authorChris Cooper <ccooper@deadsquid.com>
Tue, 19 Feb 2013 07:52:48 -0500
changeset 127546 d7fea7ffcdfaad80f07ecc563ba51b13d08d2dae
parent 127545 2862d1b3c74c2364139862674d6af548b52429d9
child 127547 8c16af22324b45f643d8c79df14fc08a673a6900
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaki, lsblakk
bugs774947
milestone20.0a2
Bug 774947 - Updated mozconfigs for l10n (NPOTB) - r=aki, a=lsblakk
browser/config/mozconfigs/linux32/l10n-mozconfig
browser/config/mozconfigs/linux64/l10n-mozconfig
browser/config/mozconfigs/macosx-universal/l10n-mozconfig
browser/config/mozconfigs/win32/l10n-mozconfig
--- a/browser/config/mozconfigs/linux32/l10n-mozconfig
+++ b/browser/config/mozconfigs/linux32/l10n-mozconfig
@@ -2,10 +2,11 @@ ac_add_options --with-l10n-base=../../l1
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 . $topsrcdir/build/unix/mozconfig.linux
 
+export MOZILLA_OFFICIAL=1
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux64/l10n-mozconfig
+++ b/browser/config/mozconfigs/linux64/l10n-mozconfig
@@ -2,10 +2,11 @@ ac_add_options --with-l10n-base=../../l1
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 . $topsrcdir/build/unix/mozconfig.linux
 
+export MOZILLA_OFFICIAL=1
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/macosx-universal/l10n-mozconfig
+++ b/browser/config/mozconfigs/macosx-universal/l10n-mozconfig
@@ -1,12 +1,11 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 
-ac_add_options --with-l10n-base=../../l10n-central
-
-if [ "${MOZ_UPDATE_CHANNEL}" = "release" -o "${MOZ_UPDATE_CHANNEL}" = "beta" ]; then
-fi
-
+ac_add_options --with-l10n-base=../../../l10n-central
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
+ac_add_options --with-macbundlename-prefix=Firefox
 ac_add_options --with-ccache
 
+export MOZILLA_OFFICIAL=1
+
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win32/l10n-mozconfig
+++ b/browser/config/mozconfigs/win32/l10n-mozconfig
@@ -1,13 +1,15 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --with-l10n-base=../../l10n-central
 
+export MOZILLA_OFFICIAL=1
+
 if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
   . $topsrcdir/build/win32/mozconfig.vs2010-win64
 else
   . $topsrcdir/build/win32/mozconfig.vs2010
 fi
 
 . "$topsrcdir/build/mozconfig.common.override"