Bug 1479210 - Change suite configs for mozilla as topsourcedir and new infrastructure. r=ewong a=IanN
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Fri, 10 Aug 2018 16:16:03 +0200
changeset 31750 32d2b0062172c6d221bf4a3dd7c1af4f30a74edd
parent 31749 213d8f29e9f009fd2dce990c3622d4fb95e2e1c8
child 31751 cb34131f6220dc3d87104a0dc68875dc6cd47326
push id47
push userfrgrahl@gmx.net
push dateFri, 10 Aug 2018 14:28:58 +0000
treeherdercomm-esr60@32d2b0062172 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersewong, IanN
bugs1479210
Bug 1479210 - Change suite configs for mozilla as topsourcedir and new infrastructure. r=ewong a=IanN
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/debug
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/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/mozconfig.gtk
suite/config/mozconfigs/mozconfig.linux.common
suite/config/mozconfigs/mozconfig.linux.l10n.common
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-l10n
--- a/suite/config/mozconfigs/linux32/debug
+++ b/suite/config/mozconfigs/linux32/debug
@@ -1,22 +1,16 @@
-. "$topsrcdir/build/mozconfig.comm-support"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
-. "$TOOLTOOL_DIR/build/unix/mozconfig.linux32"
-. "$TOOLTOOL_DIR/build/mozconfig.stylo"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $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
 
-# 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-application=comm/suite
 ac_add_options --enable-debug
 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
 
--- a/suite/config/mozconfigs/linux32/l10n-mozconfig
+++ b/suite/config/mozconfigs/linux32/l10n-mozconfig
@@ -1,6 +1,4 @@
-. "$topsrcdir/build/mozconfig.comm-support"
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
-
-. "$TOOLTOOL_DIR/build/unix/mozconfig.linux32"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.l10n.common"
+. $TOOLTOOL_DIR/build/unix/mozconfig.linux32
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.linux.l10n.common
--- a/suite/config/mozconfigs/linux32/nightly
+++ b/suite/config/mozconfigs/linux32/nightly
@@ -1,22 +1,16 @@
-. "$topsrcdir/build/mozconfig.comm-support"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
-. "$TOOLTOOL_DIR/build/unix/mozconfig.linux32"
-. "$TOOLTOOL_DIR/build/mozconfig.stylo"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $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
 
-# 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-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='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
--- a/suite/config/mozconfigs/linux32/release
+++ b/suite/config/mozconfigs/linux32/release
@@ -1,22 +1,16 @@
-. "$topsrcdir/build/mozconfig.comm-support"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
-. "$TOOLTOOL_DIR/build/unix/mozconfig.linux32"
-. "$TOOLTOOL_DIR/build/mozconfig.stylo"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $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
 
-# 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-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='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
--- a/suite/config/mozconfigs/linux32/release-l10n
+++ b/suite/config/mozconfigs/linux32/release-l10n
@@ -1,6 +1,4 @@
-. "$topsrcdir/build/mozconfig.comm-support"
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
-
-. "$TOOLTOOL_DIR/build/unix/mozconfig.linux32"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.l10n.common"
+. $TOOLTOOL_DIR/build/unix/mozconfig.linux32
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.linux.l10n.common
--- a/suite/config/mozconfigs/linux64/debug
+++ b/suite/config/mozconfigs/linux64/debug
@@ -1,22 +1,16 @@
-. "$topsrcdir/build/mozconfig.comm-support"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
-. "$TOOLTOOL_DIR/build/unix/mozconfig.linux"
-. "$TOOLTOOL_DIR/build/mozconfig.stylo"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $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
 
-# 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-application=comm/suite
 ac_add_options --enable-debug
 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
 
--- a/suite/config/mozconfigs/linux64/l10n-mozconfig
+++ b/suite/config/mozconfigs/linux64/l10n-mozconfig
@@ -1,6 +1,4 @@
-. "$topsrcdir/build/mozconfig.comm-support"
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
-
-. "$TOOLTOOL_DIR/build/unix/mozconfig.linux"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.l10n.common"
+. $TOOLTOOL_DIR/build/unix/mozconfig.linux
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.linux.l10n.common
--- a/suite/config/mozconfigs/linux64/nightly
+++ b/suite/config/mozconfigs/linux64/nightly
@@ -1,22 +1,16 @@
-. "$topsrcdir/build/mozconfig.comm-support"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
-. "$TOOLTOOL_DIR/build/unix/mozconfig.linux"
-. "$TOOLTOOL_DIR/build/mozconfig.stylo"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $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
 
-# 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-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='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
--- a/suite/config/mozconfigs/linux64/release
+++ b/suite/config/mozconfigs/linux64/release
@@ -1,22 +1,16 @@
-. "$topsrcdir/build/mozconfig.comm-support"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
-. "$TOOLTOOL_DIR/build/unix/mozconfig.linux"
-. "$TOOLTOOL_DIR/build/mozconfig.stylo"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $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
 
-# 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-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='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
--- a/suite/config/mozconfigs/linux64/release-l10n
+++ b/suite/config/mozconfigs/linux64/release-l10n
@@ -1,6 +1,4 @@
-. "$topsrcdir/build/mozconfig.comm-support"
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
-
-. "$TOOLTOOL_DIR/build/unix/mozconfig.linux"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.l10n.common"
+. $TOOLTOOL_DIR/build/unix/mozconfig.linux
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.linux.l10n.common
--- a/suite/config/mozconfigs/linux64/source
+++ b/suite/config/mozconfigs/linux64/source
@@ -1,7 +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=suite
+ac_add_options --enable-application=comm/suite
 ac_add_options --enable-calendar
--- a/suite/config/mozconfigs/macosx64/debug
+++ b/suite/config/mozconfigs/macosx64/debug
@@ -1,21 +1,17 @@
-. "$topsrcdir/build/mozconfig.comm-support"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
 . $TOOLTOOL_DIR/build/macosx/mozconfig.common
-. $TOOLTOOL_DIR/suite/config/mozconfigs/common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/common
 
-ac_add_options --enable-application=suite
+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
-
-# 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,20 +1,16 @@
-. "$topsrcdir/build/mozconfig.comm-support"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
 . $TOOLTOOL_DIR/build/macosx/mozconfig.common
-. $TOOLTOOL_DIR/suite/config/mozconfigs/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=suite
+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
-
-# 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/mozconfig.comm-support"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
 . $TOOLTOOL_DIR/build/macosx/mozconfig.common
-. $TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.macosx.common
-. $TOOLTOOL_DIR/suite/config/mozconfigs/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=suite
+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
-
-# 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/mozconfig.comm-support"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
 . $TOOLTOOL_DIR/build/macosx/mozconfig.common
-. $TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.macosx.common
-. $TOOLTOOL_DIR/suite/config/mozconfigs/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=suite
+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
-
-# 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,20 +1,16 @@
-. "$topsrcdir/build/mozconfig.comm-support"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
 . $TOOLTOOL_DIR/build/macosx/mozconfig.common
-. $TOOLTOOL_DIR/suite/config/mozconfigs/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=suite
+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
-
-# XXX hack to work around dsymutil failing on OSX builds (bug 1380381, 1385855)
-ac_add_options RUSTFLAGS='-C debuginfo=1'
new file mode 100644
--- /dev/null
+++ b/suite/config/mozconfigs/mozconfig.gtk
@@ -0,0 +1,24 @@
+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="$TOOLTOOL_DIR/gtk3/usr/local/lib/pkgconfig"
+PKG_CONFIG="$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"
--- a/suite/config/mozconfigs/mozconfig.linux.common
+++ b/suite/config/mozconfigs/mozconfig.linux.common
@@ -1,11 +1,13 @@
 # Common statements that are applicable to both Linux32 and Linux64.
 
-# Due to bug 1426758, we need to re-include mozconfig.gtk with our
+# Due to bug 1426785, we need to re-include mozconfig.gtk with our
 # linux* builders.
-. ${TOOLTOOL_DIR}/build/unix/mozconfig.gtk
+. $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-google-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
--- a/suite/config/mozconfigs/mozconfig.linux.l10n.common
+++ b/suite/config/mozconfigs/mozconfig.linux.l10n.common
@@ -1,22 +1,20 @@
 # Common statements that are applicable to both l10n Linux32 and Linux64.
 
-. "$TOOLTOOL_DIR/build/mozconfig.stylo"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/common
 
-# Due to bug 1426758, we need to re-include mozconfig.gtk with our
+# Due to bug 1426785, we need to re-include mozconfig.gtk with our
 # linux* builders.
-. ${TOOLTOOL_DIR}/build/unix/mozconfig.gtk
+. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.gtk
 
-# 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
+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=suite
+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
--- a/suite/config/mozconfigs/win32/debug
+++ b/suite/config/mozconfigs/win32/debug
@@ -1,19 +1,17 @@
-. "$topsrcdir/build/mozconfig.comm-support"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
-. "$TOOLTOOL_DIR/build/mozconfig.win-common"
-. "$TOOLTOOL_DIR/build/mozconfig.common"
-. "$TOOLTOOL_DIR/build/mozconfig.stylo"
-. "$TOOLTOOL_DIR/build/win32/mozconfig.vs2015-win64"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $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=suite
+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
--- a/suite/config/mozconfigs/win32/l10n-mozconfig
+++ b/suite/config/mozconfigs/win32/l10n-mozconfig
@@ -1,20 +1,17 @@
-. "$topsrcdir/build/mozconfig.comm-support"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
-. "$TOOLTOOL_DIR/build/mozconfig.win-common"
-. "$TOOLTOOL_DIR/build/mozconfig.common"
-. "$TOOLTOOL_DIR/build/mozconfig.stylo"
-. "$TOOLTOOL_DIR/build/win32/mozconfig.vs-latest"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $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=suite
+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
 
--- a/suite/config/mozconfigs/win32/nightly
+++ b/suite/config/mozconfigs/win32/nightly
@@ -1,20 +1,18 @@
-. "$topsrcdir/build/mozconfig.comm-support"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
-. "$TOOLTOOL_DIR/build/mozconfig.win-common"
-. "$TOOLTOOL_DIR/build/mozconfig.common"
-. "$TOOLTOOL_DIR/build/mozconfig.stylo"
-. "$TOOLTOOL_DIR/build/win32/mozconfig.vs2015-win64"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.win.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $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=suite
+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
 
--- a/suite/config/mozconfigs/win32/release
+++ b/suite/config/mozconfigs/win32/release
@@ -1,20 +1,18 @@
-. "$topsrcdir/build/mozconfig.comm-support"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
-. "$TOOLTOOL_DIR/build/mozconfig.win-common"
-. "$TOOLTOOL_DIR/build/mozconfig.common"
-. "$TOOLTOOL_DIR/build/mozconfig.stylo"
-. "$TOOLTOOL_DIR/build/win32/mozconfig.vs-latest"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.win.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $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=suite
+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
 
--- a/suite/config/mozconfigs/win32/release-l10n
+++ b/suite/config/mozconfigs/win32/release-l10n
@@ -1,20 +1,18 @@
-. "$topsrcdir/build/mozconfig.comm-support"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
-. "$TOOLTOOL_DIR/build/mozconfig.win-common"
-. "$TOOLTOOL_DIR/build/mozconfig.common"
-. "$TOOLTOOL_DIR/build/mozconfig.stylo"
-. "$TOOLTOOL_DIR/build/win32/mozconfig.vs-latest"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $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=suite
+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
 
--- a/suite/config/mozconfigs/win64/debug
+++ b/suite/config/mozconfigs/win64/debug
@@ -1,25 +1,27 @@
-. "$topsrcdir/build/mozconfig.comm-support"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/build/mozconfig.common"
-. "$topsrcdir/build/mozconfig.stylo"
-. "$topsrcdir/build/win64/mozconfig.vs-latest"
-. "$topsrcdir/suite/config/mozconfigs/common"
+. $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=suite
+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
--- a/suite/config/mozconfigs/win64/l10n-mozconfig
+++ b/suite/config/mozconfigs/win64/l10n-mozconfig
@@ -1,25 +1,25 @@
-. "$topsrcdir/build/mozconfig.comm-support"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
-. "$TOOLTOOL_DIR/build/mozconfig.win-common"
-. "$TOOLTOOL_DIR/build/mozconfig.common"
-. "$TOOLTOOL_DIR/build/mozconfig.stylo"
-. "$TOOLTOOL_DIR/build/win64/mozconfig.vs-latest"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $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=suite
+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
--- a/suite/config/mozconfigs/win64/nightly
+++ b/suite/config/mozconfigs/win64/nightly
@@ -1,28 +1,29 @@
-. "$topsrcdir/build/mozconfig.comm-support"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
-. "$TOOLTOOL_DIR/build/mozconfig.win-common"
-. "$TOOLTOOL_DIR/build/mozconfig.common"
-. "$TOOLTOOL_DIR/build/mozconfig.stylo"
-. "$TOOLTOOL_DIR/build/win64/mozconfig.vs-latest"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.win.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $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=suite
+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
--- a/suite/config/mozconfigs/win64/release
+++ b/suite/config/mozconfigs/win64/release
@@ -1,28 +1,29 @@
-. "$topsrcdir/build/mozconfig.comm-support"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
-. "$TOOLTOOL_DIR/build/mozconfig.win-common"
-. "$TOOLTOOL_DIR/build/mozconfig.common"
-. "$TOOLTOOL_DIR/build/mozconfig.stylo"
-. "$TOOLTOOL_DIR/build/win64/mozconfig.vs-latest"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.win.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $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=suite
+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
new file mode 100644
--- /dev/null
+++ b/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