Bug 1061348 - Port |Bug 575283 - Cleanup mozconfig files on all platforms| to SeaMonkey. r=ewong a=ewong SEA_COMM490_20160927_RELBRANCH SEAMONKEY_2_46_BUILD4 SEAMONKEY_2_46_BUILD5
authorIan Neal <iann_cvs@blueyonder.co.uk>
Mon, 03 Oct 2016 20:24:49 +0200
branchSEA_COMM490_20160927_RELBRANCH
changeset 27400 a8211fcb6a6feb34570e03a64ce9356c1976d9f7
parent 27399 b96f4ce8b7ec77e526d9e286ffebd3778b8714b8
child 27401 ab4421c940b95e947d5a6309280763652b5fff0d
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersewong, ewong
bugs1061348, 575283
Bug 1061348 - Port |Bug 575283 - Cleanup mozconfig files on all platforms| to SeaMonkey. r=ewong a=ewong
suite/config/mozconfigs/linux32/debug
suite/config/mozconfigs/linux32/l10n-mozconfig
suite/config/mozconfigs/linux32/nightly
suite/config/mozconfigs/linux32/release
suite/config/mozconfigs/linux32/release-l10n
suite/config/mozconfigs/linux64/l10n-mozconfig
suite/config/mozconfigs/linux64/nightly
suite/config/mozconfigs/linux64/release
suite/config/mozconfigs/linux64/release-l10n
suite/config/mozconfigs/linux64/source
suite/config/mozconfigs/macosx-universal/l10n-mozconfig
suite/config/mozconfigs/macosx-universal/nightly
suite/config/mozconfigs/macosx-universal/release
suite/config/mozconfigs/macosx-universal/release-l10n
suite/config/mozconfigs/macosx64/debug
suite/config/mozconfigs/win32/debug
suite/config/mozconfigs/win32/l10n-mozconfig
suite/config/mozconfigs/win32/nightly
suite/config/mozconfigs/win32/release
suite/config/mozconfigs/win32/release-l10n
--- a/suite/config/mozconfigs/linux32/debug
+++ b/suite/config/mozconfigs/linux32/debug
@@ -1,24 +1,16 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
 
 ac_add_options --enable-application=suite
 
 ac_add_options --enable-debug
 
-ac_add_options --enable-tests
-
 ac_add_options --enable-calendar
 
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
--- a/suite/config/mozconfigs/linux32/l10n-mozconfig
+++ b/suite/config/mozconfigs/linux32/l10n-mozconfig
@@ -1,24 +1,17 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
 
 ac_add_options --enable-application=suite
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
 # Build lightning locales
 ac_add_options --enable-calendar
 
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
 
--- a/suite/config/mozconfigs/linux32/nightly
+++ b/suite/config/mozconfigs/linux32/nightly
@@ -1,25 +1,16 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
 
 ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --disable-debug
-ac_add_options --enable-tests
 ac_add_options --disable-elf-hack
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
--- a/suite/config/mozconfigs/linux32/release
+++ b/suite/config/mozconfigs/linux32/release
@@ -1,23 +1,14 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
 
 ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --disable-debug
-ac_add_options --enable-tests
 ac_add_options --enable-calendar
 
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
--- a/suite/config/mozconfigs/linux32/release-l10n
+++ b/suite/config/mozconfigs/linux32/release-l10n
@@ -1,23 +1,15 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
 
 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-optimize
 ac_add_options --disable-compile-environment
 
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
 
--- a/suite/config/mozconfigs/linux64/l10n-mozconfig
+++ b/suite/config/mozconfigs/linux64/l10n-mozconfig
@@ -2,22 +2,16 @@
 
 ac_add_options --enable-application=suite
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 # Build lightning locales
 ac_add_options --enable-calendar
 
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
 
--- a/suite/config/mozconfigs/linux64/nightly
+++ b/suite/config/mozconfigs/linux64/nightly
@@ -1,21 +1,16 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
 
 ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --disable-debug
-ac_add_options --enable-tests
 ac_add_options --disable-elf-hack
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
--- a/suite/config/mozconfigs/linux64/release
+++ b/suite/config/mozconfigs/linux64/release
@@ -1,19 +1,14 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
 
 ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --disable-debug
-ac_add_options --enable-tests
 ac_add_options --enable-calendar
 
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
--- a/suite/config/mozconfigs/linux64/release-l10n
+++ b/suite/config/mozconfigs/linux64/release-l10n
@@ -1,19 +1,15 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
 
 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 --disable-compile-environment
 
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
 
--- a/suite/config/mozconfigs/linux64/source
+++ b/suite/config/mozconfigs/linux64/source
@@ -1,25 +1,20 @@
 # The source "build" only needs a mozconfig because we use the build system as
 # our script for generating it. This allows us to run configure without any
 # extra dependencies on specific toolchains, e.g. gtk3.
 . "$topsrcdir/build/unix/mozconfig.linux"
 
 ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
 ac_add_options --enable-calendar
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --disable-debug
 ac_add_options --enable-debug-symbols
-ac_add_options --enable-tests
 ac_add_options --enable-calendar
 ac_add_options --disable-compile-environment
 
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
--- a/suite/config/mozconfigs/macosx-universal/l10n-mozconfig
+++ b/suite/config/mozconfigs/macosx-universal/l10n-mozconfig
@@ -9,23 +9,16 @@ fi
 
 . $topsrcdir/build/macosx/universal/mozconfig.common
 
 ac_add_options --enable-application=suite
 ac_add_options --with-l10n-base=../../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --disable-install-strip
 
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
 # Build lightning locales
 ac_add_options --enable-calendar
 mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
--- a/suite/config/mozconfigs/macosx-universal/nightly
+++ b/suite/config/mozconfigs/macosx-universal/nightly
@@ -10,27 +10,19 @@ fi
 # Make sure Lightning is also unified, this needs to happen before including
 # the universal mozconfig because Lightning's univeral.mk needs to run first.
 mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
 
 . $topsrcdir/build/macosx/universal/mozconfig
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-tests
 ac_add_options --disable-install-strip
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
--- a/suite/config/mozconfigs/macosx-universal/release
+++ b/suite/config/mozconfigs/macosx-universal/release
@@ -10,25 +10,17 @@ fi
 # Make sure Lightning is also unified, this needs to happen before including
 # the universal mozconfig because Lightning's univeral.mk needs to run first.
 mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
 
 . $topsrcdir/build/macosx/universal/mozconfig
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-tests
 ac_add_options --enable-calendar
 
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
--- a/suite/config/mozconfigs/macosx-universal/release-l10n
+++ b/suite/config/mozconfigs/macosx-universal/release-l10n
@@ -1,19 +1,12 @@
 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 --disable-compile-environment
 
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
--- a/suite/config/mozconfigs/macosx64/debug
+++ b/suite/config/mozconfigs/macosx64/debug
@@ -1,18 +1,13 @@
 . $topsrcdir/build/macosx/mozconfig.common
 
 ac_add_options --enable-debug
 
 ac_add_options --enable-application=suite
-ac_add_options --enable-tests
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
--- a/suite/config/mozconfigs/win32/debug
+++ b/suite/config/mozconfigs/win32/debug
@@ -4,19 +4,16 @@
 ac_add_options --enable-application=suite
 ac_add_options --enable-debug
 ac_add_options --enable-require-all-d3dc-versions
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
--- a/suite/config/mozconfigs/win32/l10n-mozconfig
+++ b/suite/config/mozconfigs/win32/l10n-mozconfig
@@ -4,19 +4,16 @@ ac_add_options --enable-application=suit
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-jemalloc
 ac_add_options --enable-require-all-d3dc-versions
 
 # Build lightning locales
 ac_add_options --enable-calendar
 
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
 
--- a/suite/config/mozconfigs/win32/nightly
+++ b/suite/config/mozconfigs/win32/nightly
@@ -1,22 +1,18 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-jemalloc
-ac_add_options --enable-tests
 ac_add_options --enable-profiling
 ac_add_options --enable-require-all-d3dc-versions
 ac_add_options --enable-calendar
 
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
 
--- a/suite/config/mozconfigs/win32/release
+++ b/suite/config/mozconfigs/win32/release
@@ -1,20 +1,16 @@
 . "$topsrcdir/build/mozconfig.common"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-jemalloc
-ac_add_options --enable-tests
 ac_add_options --enable-calendar
 ac_add_options --enable-require-all-d3dc-versions
 
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 . $topsrcdir/build/win32/mozconfig.vs-latest
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
--- a/suite/config/mozconfigs/win32/release-l10n
+++ b/suite/config/mozconfigs/win32/release-l10n
@@ -1,18 +1,15 @@
 . "$topsrcdir/build/mozconfig.common"
 
 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 --disable-compile-environment
 
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0