Bug 1404638 - Enable legacy extensions in SeaMonkey configs. r=IanN a=IanN
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Tue, 03 Oct 2017 13:21:51 +0200
changeset 29795 c12e6f8c6f73a0c74e4f316637af54c86d82f875
parent 29794 cd796e4f34e95f3dda6b2851d2b31c2a5c915956
child 29796 8d15df25387ffe060b05e32414357ae672aa045f
push id378
push userclokep@gmail.com
push dateMon, 13 Nov 2017 18:45:35 +0000
reviewersIanN, IanN
bugs1404638, 1373375
Bug 1404638 - Enable legacy extensions in SeaMonkey configs. r=IanN a=IanN Followup for Bug 1373375.
suite/config/mozconfigs/common
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/macosx64/debug
suite/config/mozconfigs/macosx64/l10n-mozconfig
suite/config/mozconfigs/macosx64/nightly
suite/config/mozconfigs/macosx64/release
suite/config/mozconfigs/macosx64/release-l10n
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
suite/config/mozconfigs/win64/debug
suite/config/mozconfigs/win64/l10n-mozconfig
suite/config/mozconfigs/win64/nightly
suite/config/mozconfigs/win64/release
suite/config/mozconfigs/win64/release-l10
suite/confvars.sh
new file mode 100644
--- /dev/null
+++ b/suite/config/mozconfigs/common
@@ -0,0 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# This file is included by all suite mozconfigs
+
+ac_add_options "MOZ_ALLOW_LEGACY_EXTENSIONS=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/debug
+++ b/suite/config/mozconfigs/linux32/debug
@@ -1,10 +1,11 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
 . "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/suite/config/mozconfigs/common"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-debug
 ac_add_options --enable-calendar
@@ -12,15 +13,10 @@ ac_add_options --enable-calendar
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=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
-
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/suite/config/mozconfigs/linux32/l10n-mozconfig
+++ b/suite/config/mozconfigs/linux32/l10n-mozconfig
@@ -1,23 +1,19 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
 . "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/suite/config/mozconfigs/common"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 # Build lightning locales
 ac_add_options --enable-calendar
 
 # 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
-
 ac_add_options --disable-stdcxx-compat
--- a/suite/config/mozconfigs/linux32/nightly
+++ b/suite/config/mozconfigs/linux32/nightly
@@ -1,11 +1,12 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
+. "$topsrcdir/build/mozconfig.stylo"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
-. "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/suite/config/mozconfigs/common"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-profiling
@@ -14,15 +15,10 @@ ac_add_options --enable-calendar
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=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
-
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/suite/config/mozconfigs/linux32/release
+++ b/suite/config/mozconfigs/linux32/release
@@ -1,11 +1,12 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
+. "$topsrcdir/build/mozconfig.stylo"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
-. "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/suite/config/mozconfigs/common"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-official-branding
@@ -14,15 +15,10 @@ ac_add_options --enable-calendar
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=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
-
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/suite/config/mozconfigs/linux32/release-l10n
+++ b/suite/config/mozconfigs/linux32/release-l10n
@@ -1,23 +1,19 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
 . "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/suite/config/mozconfigs/common"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 # Build lightning locales
 ac_add_options --enable-calendar
 
 # 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
-
 ac_add_options --disable-stdcxx-compat
--- a/suite/config/mozconfigs/linux64/l10n-mozconfig
+++ b/suite/config/mozconfigs/linux64/l10n-mozconfig
@@ -1,23 +1,19 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
 . "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/suite/config/mozconfigs/common"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 # Build lightning locales
 ac_add_options --enable-calendar
 
 # 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
-
 ac_add_options --disable-stdcxx-compat
--- a/suite/config/mozconfigs/linux64/nightly
+++ b/suite/config/mozconfigs/linux64/nightly
@@ -1,11 +1,12 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
+. "$topsrcdir/build/mozconfig.stylo"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
-. "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/suite/config/mozconfigs/common"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-profiling
@@ -14,15 +15,10 @@ ac_add_options --enable-calendar
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=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
-
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/suite/config/mozconfigs/linux64/release
+++ b/suite/config/mozconfigs/linux64/release
@@ -1,11 +1,12 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
+. "$topsrcdir/build/mozconfig.stylo"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
-. "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/suite/config/mozconfigs/common"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-official-branding
@@ -14,15 +15,10 @@ ac_add_options --enable-calendar
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=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
-
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/suite/config/mozconfigs/linux64/release-l10n
+++ b/suite/config/mozconfigs/linux64/release-l10n
@@ -1,23 +1,19 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
 . "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/suite/config/mozconfigs/common"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 # Build lightning locales
 ac_add_options --enable-calendar
 
 # 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
-
 ac_add_options --disable-stdcxx-compat
--- a/suite/config/mozconfigs/macosx64/debug
+++ b/suite/config/mozconfigs/macosx64/debug
@@ -1,21 +1,17 @@
 . $topsrcdir/build/macosx/mozconfig.common
+. $topsrcdir/suite/config/mozconfigs/common
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-debug
 ac_add_options --enable-calendar
 
 # 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
-
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-ccache
 
 # XXX hack to work around dsymutil failing on OSX builds (bug 1380381, 1385855)
 ac_add_options RUSTFLAGS='-C debuginfo=1'
--- a/suite/config/mozconfigs/macosx64/l10n-mozconfig
+++ b/suite/config/mozconfigs/macosx64/l10n-mozconfig
@@ -1,23 +1,19 @@
 . $topsrcdir/build/macosx/mozconfig.common
+. $topsrcdir/suite/config/mozconfigs/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-install-strip
 
 # Build lightning locales
 ac_add_options --enable-calendar
 
 # Disabling is needed, see bug 1345422 comment #58.
 ac_add_options --disable-compile-environment
 
 # 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
-
 # XXX hack to work around dsymutil failing on OSX builds (bug 1380381, 1385855)
 ac_add_options RUSTFLAGS='-C debuginfo=1'
--- a/suite/config/mozconfigs/macosx64/nightly
+++ b/suite/config/mozconfigs/macosx64/nightly
@@ -1,24 +1,20 @@
 . $topsrcdir/build/macosx/mozconfig.common
 . $topsrcdir/suite/config/mozconfigs/mozconfig.macosx.common
+. $topsrcdir/suite/config/mozconfigs/common
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --disable-install-strip
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=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
-
 ac_add_options --with-ccache
 
 # XXX hack to work around dsymutil failing on OSX builds (bug 1380381, 1385855)
 ac_add_options RUSTFLAGS='-C debuginfo=1'
--- a/suite/config/mozconfigs/macosx64/release
+++ b/suite/config/mozconfigs/macosx64/release
@@ -1,21 +1,17 @@
 . $topsrcdir/build/macosx/mozconfig.common
 . $topsrcdir/suite/config/mozconfigs/mozconfig.macosx.common
+. $topsrcdir/suite/config/mozconfigs/common
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-official-branding
 ac_add_options --enable-calendar
 
 # 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
-
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
 # XXX hack to work around dsymutil failing on OSX builds (bug 1380381, 1385855)
 ac_add_options RUSTFLAGS='-C debuginfo=1'
--- a/suite/config/mozconfigs/macosx64/release-l10n
+++ b/suite/config/mozconfigs/macosx64/release-l10n
@@ -1,23 +1,19 @@
 . $topsrcdir/build/macosx/mozconfig.common
+. $topsrcdir/suite/config/mozconfigs/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-install-strip
 
 # Build lightning locales
 ac_add_options --enable-calendar
 
 # Disabling is needed, see bug 1345422 comment #58.
 ac_add_options --disable-compile-environment
 
 # 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
-
 # XXX hack to work around dsymutil failing on OSX builds (bug 1380381, 1385855)
 ac_add_options RUSTFLAGS='-C debuginfo=1'
--- a/suite/config/mozconfigs/win32/debug
+++ b/suite/config/mozconfigs/win32/debug
@@ -1,24 +1,19 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/build/win32/mozconfig.vs-latest"
+. "$topsrcdir/suite/config/mozconfigs/common"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-debug
 ac_add_options --enable-calendar
 
 # 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
-
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
-. $topsrcdir/build/win32/mozconfig.vs-latest
-
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
--- a/suite/config/mozconfigs/win32/l10n-mozconfig
+++ b/suite/config/mozconfigs/win32/l10n-mozconfig
@@ -1,24 +1,19 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/build/win32/mozconfig.vs-latest"
+. "$topsrcdir/suite/config/mozconfigs/common"
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 # Build lightning locales
 ac_add_options --enable-calendar
 
 # 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
-
-. $topsrcdir/build/win32/mozconfig.vs-latest
-
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
--- a/suite/config/mozconfigs/win32/nightly
+++ b/suite/config/mozconfigs/win32/nightly
@@ -1,27 +1,24 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
+. "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/build/win32/mozconfig.vs-latest"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.win.common"
-. "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/suite/config/mozconfigs/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-profiling
 ac_add_options --enable-calendar
 
 # 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
-
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
 . $topsrcdir/build/win32/mozconfig.vs-latest
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
--- a/suite/config/mozconfigs/win32/release
+++ b/suite/config/mozconfigs/win32/release
@@ -1,27 +1,22 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
+. "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/build/win32/mozconfig.vs-latest"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.win.common"
-. "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/suite/config/mozconfigs/common"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-official-branding
 ac_add_options --enable-jemalloc
 ac_add_options --enable-calendar
 
 # 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
-
-. $topsrcdir/build/win32/mozconfig.vs-latest
-
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
--- a/suite/config/mozconfigs/win32/release-l10n
+++ b/suite/config/mozconfigs/win32/release-l10n
@@ -1,24 +1,19 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/build/win32/mozconfig.vs-latest"
+. "$topsrcdir/suite/config/mozconfigs/common"
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 # Build lightning locales
 ac_add_options --enable-calendar
 
 # 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
-
-. $topsrcdir/build/win32/mozconfig.vs-latest
-
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
--- a/suite/config/mozconfigs/win64/debug
+++ b/suite/config/mozconfigs/win64/debug
@@ -1,27 +1,22 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/build/win64/mozconfig.vs-latest"
+. "$topsrcdir/suite/config/mozconfigs/common"
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-debug
 ac_add_options --enable-calendar
 
 # 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
-
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
-. $topsrcdir/build/win64/mozconfig.vs-latest
-
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
--- a/suite/config/mozconfigs/win64/l10n-mozconfig
+++ b/suite/config/mozconfigs/win64/l10n-mozconfig
@@ -1,27 +1,22 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/build/win64/mozconfig.vs-latest"
+. "$topsrcdir/suite/config/mozconfigs/common"
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 # Build lightning locales
 ac_add_options --enable-calendar
 
 # 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
-
-. $topsrcdir/build/win64/mozconfig.vs-latest
-
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
--- a/suite/config/mozconfigs/win64/nightly
+++ b/suite/config/mozconfigs/win64/nightly
@@ -1,30 +1,25 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
+. "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/build/win64/mozconfig.vs-latest"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.win.common"
-. "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/suite/config/mozconfigs/common"
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-jemalloc
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
 # 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
-
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
-. $topsrcdir/build/win64/mozconfig.vs-latest
-
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
--- a/suite/config/mozconfigs/win64/release
+++ b/suite/config/mozconfigs/win64/release
@@ -1,30 +1,25 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
+. "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/build/win64/mozconfig.vs-latest"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.win.common"
-. "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/suite/config/mozconfigs/common"
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-official-branding
 ac_add_options --enable-jemalloc
 ac_add_options --enable-calendar
 
 # 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
-
-. $topsrcdir/build/win32/mozconfig.vs-latest
-
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
--- a/suite/config/mozconfigs/win64/release-l10
+++ b/suite/config/mozconfigs/win64/release-l10
@@ -1,27 +1,22 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/build/win64/mozconfig.vs-latest"
+. "$topsrcdir/suite/config/mozconfigs/common"
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 # Build lightning locales
 ac_add_options --enable-calendar
 
 # 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
-
-. $topsrcdir/build/win64/mozconfig.vs-latest
-
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -8,17 +8,16 @@ MOZ_APP_VENDOR=Mozilla
 MOZ_APP_NAME=seamonkey
 MOZ_APP_DISPLAYNAME=SeaMonkey
 MOZ_LDAP_XPCOM=1
 MOZ_COMPOSER=1
 MOZ_SUITE=1
 MOZ_BRANDING_DIRECTORY=suite/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=suite/branding/nightly
 MOZ_EXTENSIONS_DEFAULT=" inspector irc"
-MOZ_ALLOW_LEGACY_EXTENSIONS=1
 MOZ_UPDATER=1
 # This should usually be the same as the value MAR_CHANNEL_ID.
 # If more than one ID is needed, then you should use a comma separated list
 # of values.
 ACCEPTED_MAR_CHANNEL_IDS=seamonkey-comm-central
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
 MAR_CHANNEL_ID=seamonkey-comm-central
 MOZ_MORK=1