Apply the mozconfig part of bug 811770 to fix pre-release mozconfig checks. May need a different fix later. r=me, a=bustage
☠☠ backed out by 070379bc4cff ☠ ☠
authorBen Hearsum <bhearsum@mozilla.com>
Fri, 04 Jan 2013 16:01:34 -0500
changeset 13597 2afbc44b813402aca28fc069a69369231d3824fa
parent 13596 590426b2cae87156b5843beadc20056466f9d024
child 13598 dbc1aefb6cd0bade624db03eb9a7de5a0c737add
child 13600 8879400cea281133e3c172c0dfd05d517a983877
push id24
push userbhearsum@mozilla.com
push dateFri, 04 Jan 2013 21:01:48 +0000
reviewersme, bustage
bugs811770
Apply the mozconfig part of bug 811770 to fix pre-release mozconfig checks. May need a different fix later. r=me, a=bustage
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,14 +1,17 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-codesighs
 ac_add_options --enable-signmar
 
+# Enable ESR branding
+export MOZ_ESR=1
+
 . $topsrcdir/build/unix/mozconfig.linux
 
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
--- a/mail/config/mozconfigs/linux64/nightly
+++ b/mail/config/mozconfigs/linux64/nightly
@@ -1,14 +1,17 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-codesighs
 ac_add_options --enable-signmar
 
+# Enable ESR branding
+export MOZ_ESR=1
+
 . $topsrcdir/build/unix/mozconfig.linux
 
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
--- a/mail/config/mozconfigs/macosx-universal/nightly
+++ b/mail/config/mozconfigs/macosx-universal/nightly
@@ -12,16 +12,19 @@ fi
 # Universal builds override the default of mail (bug 575283 comment 29)
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-codesighs
 ac_add_options --disable-install-strip
 ac_add_options --enable-signmar
 
+# Enable ESR branding
+export MOZ_ESR=1
+
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Enable parallel compiling
 CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
--- a/mail/config/mozconfigs/win32/nightly
+++ b/mail/config/mozconfigs/win32/nightly
@@ -1,14 +1,17 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
 ac_add_options --enable-signmar
 
+# Enable ESR branding
+export MOZ_ESR=1
+
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
   . $topsrcdir/build/win32/mozconfig.vs2010-win64