Part of bug 811770 - add mozconfig files for esr branded release. r=mconley,a=Standard8
☠☠ backed out by 489d7750fe04 ☠ ☠
authorMark Banner <bugzilla@standard8.plus.com>
Wed, 02 Jan 2013 21:07:52 +0000
changeset 13593 6edb04be80599e01cd64cb9161af6817d682920a
parent 13592 c96629272e7f187ee03ce158e0b7f91176eae20a
child 13594 ae503020d67f1e8b9a5798cab69c416d549cb576
push id22
push userbugzilla@standard8.plus.com
push dateWed, 02 Jan 2013 21:09:45 +0000
reviewersmconley, Standard8
bugs811770
Part of bug 811770 - add mozconfig files for esr branded release. r=mconley,a=Standard8
mail/config/mozconfigs/linux32/esr
mail/config/mozconfigs/linux64/esr
mail/config/mozconfigs/macosx-universal/esr
mail/config/mozconfigs/win32/esr
copy from mail/config/mozconfigs/linux32/release
copy to mail/config/mozconfigs/linux32/esr
--- a/mail/config/mozconfigs/linux32/release
+++ b/mail/config/mozconfigs/linux32/esr
@@ -1,13 +1,16 @@
 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-official-branding
 
+# 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
 
copy from mail/config/mozconfigs/linux64/release
copy to mail/config/mozconfigs/linux64/esr
--- a/mail/config/mozconfigs/linux64/release
+++ b/mail/config/mozconfigs/linux64/esr
@@ -1,13 +1,16 @@
 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-official-branding
 
+# 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
 
copy from mail/config/mozconfigs/macosx-universal/release
copy to mail/config/mozconfigs/macosx-universal/esr
--- a/mail/config/mozconfigs/macosx-universal/release
+++ b/mail/config/mozconfigs/macosx-universal/esr
@@ -10,16 +10,19 @@ fi
 . $topsrcdir/build/macosx/universal/mozconfig
 
 # 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-official-branding
 
+# 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 ))
copy from mail/config/mozconfigs/win32/release
copy to mail/config/mozconfigs/win32/esr
--- a/mail/config/mozconfigs/win32/release
+++ b/mail/config/mozconfigs/win32/esr
@@ -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-official-branding
 
+# 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