Adding upstream version 1:115.7.0.upstream/1%115.7.0upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

34 files changed, 601 insertions, 0 deletions

diff --git a/comm/suite/config/mozconfigs/common b/comm/suite/config/mozconfigs/common
new file mode 100644
index 0000000000..36f268a11c
--- /dev/null
+++ b/comm/suite/config/mozconfigs/common
@@ -0,0 +1,27 @@
+# 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
+
+# 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
+
+mk_add_options "export MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS}"
+mk_add_options "export MOZ_SCM_LEVEL=3"
+# Post bug 1422735, we now send symbols to Tecken.
+# Post bug 1422735, we now send symbols to Tecken.
+# See bug 1422737.  Despite it saying SOCORRO, it's actually using
+# the new Tecken symbol token.
+
+case "$platform" in
+    win*)
+       mk_add_options "export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=c:/builds/crash-stats-api.token"
+       ;;
+    *)
+       mk_add_options "export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token"
+       ;;
+esac
+
diff --git a/comm/suite/config/mozconfigs/linux32/debug b/comm/suite/config/mozconfigs/linux32/debug
new file mode 100644
index 0000000000..d4392a64f2
--- /dev/null
+++ b/comm/suite/config/mozconfigs/linux32/debug
@@ -0,0 +1,21 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/unix/mozconfig.linux32
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.linux.common
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/common
+
+ac_add_options --enable-application=comm/suite
+ac_add_options --enable-debug
+ac_add_options --enable-calendar
+
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON3) @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
+
+#Use ccache
+ac_add_options --with-ccache=/usr/bin/ccache
diff --git a/comm/suite/config/mozconfigs/linux32/l10n-mozconfig b/comm/suite/config/mozconfigs/linux32/l10n-mozconfig
new file mode 100644
index 0000000000..e9dbbbf021
--- /dev/null
+++ b/comm/suite/config/mozconfigs/linux32/l10n-mozconfig
@@ -0,0 +1,4 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/unix/mozconfig.linux32
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.linux.l10n.common
diff --git a/comm/suite/config/mozconfigs/linux32/nightly b/comm/suite/config/mozconfigs/linux32/nightly
new file mode 100644
index 0000000000..364eab3a08
--- /dev/null
+++ b/comm/suite/config/mozconfigs/linux32/nightly
@@ -0,0 +1,25 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/unix/mozconfig.linux32
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.linux.common
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/common
+
+ac_add_options --enable-application=comm/suite
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-profiling
+ac_add_options --enable-calendar
+
+# Bug 1441155 - Disable the generation of Rust debug symbols on Linux32
+ac_add_options --disable-debug-symbols
+
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON3) @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
+
+#Use ccache
+ac_add_options --with-ccache=/usr/bin/ccache
diff --git a/comm/suite/config/mozconfigs/linux32/release b/comm/suite/config/mozconfigs/linux32/release
new file mode 100644
index 0000000000..8795b21585
--- /dev/null
+++ b/comm/suite/config/mozconfigs/linux32/release
@@ -0,0 +1,25 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/unix/mozconfig.linux32
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.linux.common
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/common
+
+ac_add_options --enable-application=comm/suite
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-official-branding
+ac_add_options --enable-calendar
+
+# Bug 1441155 - Disable the generation of Rust debug symbols on Linux32
+ac_add_options --disable-debug-symbols
+
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON3) @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
+
+#Use ccache
+ac_add_options --with-ccache=/usr/bin/ccache
diff --git a/comm/suite/config/mozconfigs/linux32/release-l10n b/comm/suite/config/mozconfigs/linux32/release-l10n
new file mode 100644
index 0000000000..e9dbbbf021
--- /dev/null
+++ b/comm/suite/config/mozconfigs/linux32/release-l10n
@@ -0,0 +1,4 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/unix/mozconfig.linux32
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.linux.l10n.common
diff --git a/comm/suite/config/mozconfigs/linux64/debug b/comm/suite/config/mozconfigs/linux64/debug
new file mode 100644
index 0000000000..9c0310bc5c
--- /dev/null
+++ b/comm/suite/config/mozconfigs/linux64/debug
@@ -0,0 +1,21 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/unix/mozconfig.linux
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.linux.common
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/common
+
+ac_add_options --enable-application=comm/suite
+ac_add_options --enable-debug
+ac_add_options --enable-calendar
+
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON3) @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
+
+#Use ccache
+ac_add_options --with-ccache=/usr/bin/ccache
diff --git a/comm/suite/config/mozconfigs/linux64/l10n-mozconfig b/comm/suite/config/mozconfigs/linux64/l10n-mozconfig
new file mode 100644
index 0000000000..87b0df3fad
--- /dev/null
+++ b/comm/suite/config/mozconfigs/linux64/l10n-mozconfig
@@ -0,0 +1,4 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/unix/mozconfig.linux
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.linux.l10n.common
diff --git a/comm/suite/config/mozconfigs/linux64/nightly b/comm/suite/config/mozconfigs/linux64/nightly
new file mode 100644
index 0000000000..8b2750f86d
--- /dev/null
+++ b/comm/suite/config/mozconfigs/linux64/nightly
@@ -0,0 +1,22 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/unix/mozconfig.linux
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.linux.common
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/common
+
+ac_add_options --enable-application=comm/suite
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-profiling
+ac_add_options --enable-calendar
+
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON3) @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
+
+#Use ccache
+ac_add_options --with-ccache=/usr/bin/ccache
diff --git a/comm/suite/config/mozconfigs/linux64/release b/comm/suite/config/mozconfigs/linux64/release
new file mode 100644
index 0000000000..e6fbf8ffd9
--- /dev/null
+++ b/comm/suite/config/mozconfigs/linux64/release
@@ -0,0 +1,22 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/unix/mozconfig.linux
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.linux.common
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/common
+
+ac_add_options --enable-application=comm/suite
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-official-branding
+ac_add_options --enable-calendar
+
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON3) @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
+
+#Use ccache
+ac_add_options --with-ccache=/usr/bin/ccache
diff --git a/comm/suite/config/mozconfigs/linux64/release-l10n b/comm/suite/config/mozconfigs/linux64/release-l10n
new file mode 100644
index 0000000000..87b0df3fad
--- /dev/null
+++ b/comm/suite/config/mozconfigs/linux64/release-l10n
@@ -0,0 +1,4 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/unix/mozconfig.linux
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.linux.l10n.common
diff --git a/comm/suite/config/mozconfigs/linux64/source b/comm/suite/config/mozconfigs/linux64/source
new file mode 100644
index 0000000000..f2a9abc640
--- /dev/null
+++ b/comm/suite/config/mozconfigs/linux64/source
@@ -0,0 +1,7 @@
+# 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.
+ac_add_options --disable-compile-environment
+
+ac_add_options --enable-application=comm/suite
+ac_add_options --enable-calendar
diff --git a/comm/suite/config/mozconfigs/macosx64/debug b/comm/suite/config/mozconfigs/macosx64/debug
new file mode 100644
index 0000000000..e26ac69194
--- /dev/null
+++ b/comm/suite/config/mozconfigs/macosx64/debug
@@ -0,0 +1,17 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/macosx/mozconfig.common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/common
+
+ac_add_options --enable-application=comm/suite
+ac_add_options --enable-debug
+ac_add_options --enable-calendar
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Package js shell
+export MOZ_PACKAGE_JSSHELL=1
+
+ac_add_options --with-ccache
diff --git a/comm/suite/config/mozconfigs/macosx64/l10n-mozconfig b/comm/suite/config/mozconfigs/macosx64/l10n-mozconfig
new file mode 100644
index 0000000000..64d4cfaad1
--- /dev/null
+++ b/comm/suite/config/mozconfigs/macosx64/l10n-mozconfig
@@ -0,0 +1,16 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/macosx/mozconfig.common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/common
+
+ac_add_options --with-l10n-base=../../l10n
+ac_add_options --enable-application=comm/suite
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --disable-install-strip
+
+# Build lightning locales
+ac_add_options --enable-calendar
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
diff --git a/comm/suite/config/mozconfigs/macosx64/nightly b/comm/suite/config/mozconfigs/macosx64/nightly
new file mode 100644
index 0000000000..b1dce5005f
--- /dev/null
+++ b/comm/suite/config/mozconfigs/macosx64/nightly
@@ -0,0 +1,20 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/macosx/mozconfig.common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.macosx.common
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/common
+
+ac_add_options --enable-application=comm/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
+
+ac_add_options --with-ccache
diff --git a/comm/suite/config/mozconfigs/macosx64/release b/comm/suite/config/mozconfigs/macosx64/release
new file mode 100644
index 0000000000..b036ec99db
--- /dev/null
+++ b/comm/suite/config/mozconfigs/macosx64/release
@@ -0,0 +1,17 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/macosx/mozconfig.common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.macosx.common
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/common
+
+ac_add_options --enable-application=comm/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
+
+# Package js shell
+export MOZ_PACKAGE_JSSHELL=1
diff --git a/comm/suite/config/mozconfigs/macosx64/release-l10n b/comm/suite/config/mozconfigs/macosx64/release-l10n
new file mode 100644
index 0000000000..64d4cfaad1
--- /dev/null
+++ b/comm/suite/config/mozconfigs/macosx64/release-l10n
@@ -0,0 +1,16 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/macosx/mozconfig.common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/common
+
+ac_add_options --with-l10n-base=../../l10n
+ac_add_options --enable-application=comm/suite
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --disable-install-strip
+
+# Build lightning locales
+ac_add_options --enable-calendar
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
diff --git a/comm/suite/config/mozconfigs/mozconfig.gtk b/comm/suite/config/mozconfigs/mozconfig.gtk
new file mode 100644
index 0000000000..803c3e62b4
--- /dev/null
+++ b/comm/suite/config/mozconfigs/mozconfig.gtk
@@ -0,0 +1,22 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir} # $TOOLTOOL_DIR/gtk3 comes from tooltool, and must be included in the tooltool manifest.
+if [ -z "$PKG_CONFIG_LIBDIR" ]; then
+  echo PKG_CONFIG_LIBDIR must be set >&2
+  exit 1
+fi
+export PKG_CONFIG_SYSROOT_DIR="$TOOLTOOL_DIR/gtk3"
+export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:$TOOLTOOL_DIR/gtk3/usr/local/lib/pkgconfig"
+PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:$TOOLTOOL_DIR/gtk3/usr/local/bin/pkg-config"
+export PATH="$TOOLTOOL_DIR/gtk3/usr/local/bin:${PATH}"
+# Ensure cairo, gdk-pixbuf, etc. are not taken from the system installed packages.
+LDFLAGS="-L$TOOLTOOL_DIR/gtk3/usr/local/lib ${LDFLAGS}"
+ac_add_options --enable-default-toolkit=cairo-gtk3
+
+# Set things up to use Gtk+3 from the tooltool package
+mk_add_options "export FONTCONFIG_PATH=$TOOLTOOL_DIR/gtk3/usr/local/etc/fonts"
+mk_add_options "export PANGO_SYSCONFDIR=$TOOLTOOL_DIR/gtk3/usr/local/etc"
+mk_add_options "export PANGO_LIBDIR=$TOOLTOOL_DIR/gtk3/usr/local/lib"
+mk_add_options "export GDK_PIXBUF_MODULE_FILE=$TOOLTOOL_DIR/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+mk_add_options "export GDK_PIXBUF_MODULEDIR=$TOOLTOOL_DIR/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders"
+
+LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOOLTOOL_DIR/gtk3/usr/local/lib
+mk_add_options "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
diff --git a/comm/suite/config/mozconfigs/mozconfig.linux.common b/comm/suite/config/mozconfigs/mozconfig.linux.common
new file mode 100644
index 0000000000..b08efbaed0
--- /dev/null
+++ b/comm/suite/config/mozconfigs/mozconfig.linux.common
@@ -0,0 +1,14 @@
+# Common statements that are applicable to both Linux32 and Linux64.
+
+export PKG_CONFIG_LIBDIR=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
+export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/lib64/pkgconfig:/usr/lib/pkgconfig"
+# Due to bug 1426785, we need to re-include mozconfig.gtk with our
+# linux* builders.
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.gtk
+
+ac_add_options --with-google-location-service-api-keyfile=/builds/google-api.key
+ac_add_options --with-google-safebrowsing-api-keyfile=/builds/google-api.key
+
+# SeaMonkey uses the google api key for Geolocation services
+# See Bug 1352850 - Switch to Google for Geolocation services
+# ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
diff --git a/comm/suite/config/mozconfigs/mozconfig.linux.l10n.common b/comm/suite/config/mozconfigs/mozconfig.linux.l10n.common
new file mode 100644
index 0000000000..02d8e1b2cb
--- /dev/null
+++ b/comm/suite/config/mozconfigs/mozconfig.linux.l10n.common
@@ -0,0 +1,20 @@
+# Common statements that are applicable to both l10n Linux32 and Linux64.
+
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/common
+
+# Due to bug 1426785, we need to re-include mozconfig.gtk with our
+# linux* builders.
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.gtk
+
+export PKG_CONFIG_LIBDIR=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
+
+ac_add_options --with-l10n-base=../../l10n
+ac_add_options --enable-application=comm/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
diff --git a/comm/suite/config/mozconfigs/mozconfig.macosx.common b/comm/suite/config/mozconfigs/mozconfig.macosx.common
new file mode 100644
index 0000000000..62bc61320f
--- /dev/null
+++ b/comm/suite/config/mozconfigs/mozconfig.macosx.common
@@ -0,0 +1,10 @@
+# Common statements that are applicable to macOS x64.
+
+# Same location as on Linux so no need to distingush when doing
+# a macOS cross compile on Linux.
+ac_add_options --with-google-location-service-api-keyfile=/builds/google-api.key
+ac_add_options --with-google-safebrowsing-api-keyfile=/builds/google-api.key
+
+# SeaMonkey uses the google api key for Geolocation services.
+# See Bug 1352850 - Switch to Google for Geolocation services.
+# ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
diff --git a/comm/suite/config/mozconfigs/mozconfig.win.common b/comm/suite/config/mozconfigs/mozconfig.win.common
new file mode 100644
index 0000000000..8b6c436bf8
--- /dev/null
+++ b/comm/suite/config/mozconfigs/mozconfig.win.common
@@ -0,0 +1,8 @@
+# Common statements that are applicable to Windows x86 and x64.
+
+ac_add_options --with-google-location-service-api-keyfile=/builds/google-api.key
+ac_add_options --with-google-safebrowsing-api-keyfile=/builds/google-api.key
+
+# SeaMonkey uses the google api key for Geolocation services
+# See Bug 1352850 - Switch to Google for Geolocation services
+# ac_add_options --with-mozilla-api-keyfile=c:/builds/mozilla-desktop-geoloc-api.key
diff --git a/comm/suite/config/mozconfigs/win32/debug b/comm/suite/config/mozconfigs/win32/debug
new file mode 100644
index 0000000000..c1597c29b6
--- /dev/null
+++ b/comm/suite/config/mozconfigs/win32/debug
@@ -0,0 +1,21 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/mozconfig.win-common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/build/mozconfig.common
+. $TOOLTOOL_DIR/build/win32/mozconfig.vs-latest
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/common
+
+ac_add_options --enable-application=comm/suite
+ac_add_options --enable-debug
+ac_add_options --enable-calendar
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# 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
diff --git a/comm/suite/config/mozconfigs/win32/l10n-mozconfig b/comm/suite/config/mozconfigs/win32/l10n-mozconfig
new file mode 100644
index 0000000000..df16292852
--- /dev/null
+++ b/comm/suite/config/mozconfigs/win32/l10n-mozconfig
@@ -0,0 +1,20 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/mozconfig.win-common
+. $TOOLTOOL_DIR/build/mozconfig.common
+. $TOOLTOOL_DIR/build/win32/mozconfig.vs-latest
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/common
+
+ac_add_options --with-l10n-base=../../l10n
+ac_add_options --enable-application=comm/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
+
+# 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
diff --git a/comm/suite/config/mozconfigs/win32/nightly b/comm/suite/config/mozconfigs/win32/nightly
new file mode 100644
index 0000000000..dea90ab6dc
--- /dev/null
+++ b/comm/suite/config/mozconfigs/win32/nightly
@@ -0,0 +1,26 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/mozconfig.win-common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/build/mozconfig.common
+. $TOOLTOOL_DIR/build/win32/mozconfig.vs-latest
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.win.common
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/common
+
+ac_add_options --enable-application=comm/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
+
+# Package js shell
+export MOZ_PACKAGE_JSSHELL=1
+
+. $TOOLTOOL_DIR/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
diff --git a/comm/suite/config/mozconfigs/win32/release b/comm/suite/config/mozconfigs/win32/release
new file mode 100644
index 0000000000..9f2f9a5e65
--- /dev/null
+++ b/comm/suite/config/mozconfigs/win32/release
@@ -0,0 +1,24 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/mozconfig.win-common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/build/mozconfig.common
+. $TOOLTOOL_DIR/build/win32/mozconfig.vs-latest
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.win.common
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/common
+
+ac_add_options --enable-application=comm/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
+
+# 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
diff --git a/comm/suite/config/mozconfigs/win32/release-l10n b/comm/suite/config/mozconfigs/win32/release-l10n
new file mode 100644
index 0000000000..24c371fb41
--- /dev/null
+++ b/comm/suite/config/mozconfigs/win32/release-l10n
@@ -0,0 +1,21 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/mozconfig.win-common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/build/mozconfig.common
+. $TOOLTOOL_DIR/build/win32/mozconfig.vs-latest
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/common
+
+ac_add_options --with-l10n-base=../../l10n
+ac_add_options --enable-application=comm/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
+
+# 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
diff --git a/comm/suite/config/mozconfigs/win64/debug b/comm/suite/config/mozconfigs/win64/debug
new file mode 100644
index 0000000000..510502b0b3
--- /dev/null
+++ b/comm/suite/config/mozconfigs/win64/debug
@@ -0,0 +1,28 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/mozconfig.win-common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/build/mozconfig.common
+. $TOOLTOOL_DIR/build/win64/mozconfig.vs-latest
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.win.common
+. $TOOLTOOL_DIR/comm/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=comm/suite
+ac_add_options --enable-debug
+ac_add_options --enable-calendar
+
+# Disable MAPI in x64 builds until Bug 393302 is resolved.
+ac_add_options --disable-mapi
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# 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
diff --git a/comm/suite/config/mozconfigs/win64/l10n-mozconfig b/comm/suite/config/mozconfigs/win64/l10n-mozconfig
new file mode 100644
index 0000000000..237aa7a3b8
--- /dev/null
+++ b/comm/suite/config/mozconfigs/win64/l10n-mozconfig
@@ -0,0 +1,26 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/mozconfig.win-common
+. $TOOLTOOL_DIR/build/mozconfig.common
+. $TOOLTOOL_DIR/build/win64/mozconfig.vs-latest
+. $TOOLTOOL_DIR/comm/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=comm/suite
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+
+# Disable MAPI in x64 builds until Bug 393302 is resolved.
+ac_add_options --disable-mapi
+
+# Build lightning locales
+ac_add_options --enable-calendar
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=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
diff --git a/comm/suite/config/mozconfigs/win64/nightly b/comm/suite/config/mozconfigs/win64/nightly
new file mode 100644
index 0000000000..722560cbb9
--- /dev/null
+++ b/comm/suite/config/mozconfigs/win64/nightly
@@ -0,0 +1,30 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/mozconfig.win-common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/build/mozconfig.common
+. $TOOLTOOL_DIR/build/win64/mozconfig.vs-latest
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.win.common
+. $TOOLTOOL_DIR/comm/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=comm/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
+
+# Disable MAPI in x64 builds until Bug 393302 is resolved.
+ac_add_options --disable-mapi
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# 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
diff --git a/comm/suite/config/mozconfigs/win64/release b/comm/suite/config/mozconfigs/win64/release
new file mode 100644
index 0000000000..23fb727e9f
--- /dev/null
+++ b/comm/suite/config/mozconfigs/win64/release
@@ -0,0 +1,30 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/mozconfig.win-common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/build/mozconfig.common
+. $TOOLTOOL_DIR/build/win64/mozconfig.vs-latest
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.win.common
+. $TOOLTOOL_DIR/comm/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=comm/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
+
+# Disable MAPI in x64 builds until Bug 393302 is resolved.
+ac_add_options --disable-mapi
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# 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
diff --git a/comm/suite/config/mozconfigs/win64/release-l10n b/comm/suite/config/mozconfigs/win64/release-l10n
new file mode 100644
index 0000000000..dd97bf0779
--- /dev/null
+++ b/comm/suite/config/mozconfigs/win64/release-l10n
@@ -0,0 +1,27 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+. $TOOLTOOL_DIR/build/mozconfig.win-common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/build/mozconfig.common
+. $TOOLTOOL_DIR/build/win64/mozconfig.vs-latest
+. $TOOLTOOL_DIR/comm/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=comm/suite
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+
+# Disable MAPI in x64 builds until Bug 393302 is resolved.
+ac_add_options --disable-mapi
+
+# Build lightning locales
+ac_add_options --enable-calendar
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=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
diff --git a/comm/suite/config/version.txt b/comm/suite/config/version.txt
new file mode 100644
index 0000000000..a6a8d58f10
--- /dev/null
+++ b/comm/suite/config/version.txt
@@ -0,0 +1 @@
+2.112
diff --git a/comm/suite/config/version_display.txt b/comm/suite/config/version_display.txt
new file mode 100644
index 0000000000..1d0091cc6c
--- /dev/null
+++ b/comm/suite/config/version_display.txt
@@ -0,0 +1 @@
+2.112b1