Clean up automated build infra mozconfigs

51 files changed, 0 insertions, 1282 deletions

diff --git a/build/macosx/cross-mozconfig.common b/build/macosx/cross-mozconfig.common
deleted file mode 100644
index 8e56394d0..000000000
--- a/build/macosx/cross-mozconfig.common
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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/.
-
-MOZ_AUTOMATION_L10N_CHECK=0
-
-if [ "x$IS_NIGHTLY" = "xyes" ]; then
-  # Some nightlies (eg: Mulet) don't want these set.
-  MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
-  MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
-fi
-. "$topsrcdir/build/mozconfig.common"
-
-# ld needs libLTO.so from llvm
-mk_add_options "export LD_LIBRARY_PATH=$topsrcdir/clang/lib"
-
-CROSS_CCTOOLS_PATH=$topsrcdir/cctools
-CROSS_SYSROOT=$topsrcdir/MacOSX10.7.sdk
-CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks
-FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT"
-
-export CC="$topsrcdir/clang/bin/clang $FLAGS"
-export CXX="$topsrcdir/clang/bin/clang++ $FLAGS"
-export CPP="$topsrcdir/clang/bin/clang $FLAGS -E"
-export LLVMCONFIG=$topsrcdir/clang/bin/llvm-config
-export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip"
-export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin10-
-export DSYMUTIL=$topsrcdir/clang/bin/llvm-dsymutil
-export GENISOIMAGE=$topsrcdir/genisoimage/genisoimage
-export DMG_TOOL=$topsrcdir/dmg/dmg
-
-export HOST_CC="$topsrcdir/clang/bin/clang"
-export HOST_CXX="$topsrcdir/clang/bin/clang++"
-export HOST_CPP="$topsrcdir/clang/bin/clang -E"
-export HOST_CFLAGS="-g"
-export HOST_CXXFLAGS="-g"
-export HOST_LDFLAGS="-g"
-
-ac_add_options --target=x86_64-apple-darwin
-ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS
-
-# Enable static analysis checks by default on OSX cross builds.
-ac_add_options --enable-clang-plugin
-
-. "$topsrcdir/build/mozconfig.cache"
-
-export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
diff --git a/build/macosx/local-mozconfig.common b/build/macosx/local-mozconfig.common
deleted file mode 100644
index 02a09d2fe..000000000
--- a/build/macosx/local-mozconfig.common
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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/.
-
-if [ "x$IS_NIGHTLY" = "xyes" ]; then
-  # Some nightlies (eg: Mulet) don't want these set.
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
-  MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
-  MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
-fi
-. "$topsrcdir/build/mozconfig.common"
-
-if [ -d "$topsrcdir/clang" ]; then
-    # mozilla-central based build
-    export CC=$topsrcdir/clang/bin/clang
-    export CXX=$topsrcdir/clang/bin/clang++
-    export LLVMCONFIG=$topsrcdir/clang/bin/llvm-config
-    export DSYMUTIL=$topsrcdir/clang/bin/llvm-dsymutil
-    # Use an updated linker.
-    ldflags="-B$topsrcdir/cctools/bin"
-elif [ -d "$topsrcdir/../clang" ]; then
-    # comm-central based build
-    export CC=$topsrcdir/../clang/bin/clang
-    export CXX=$topsrcdir/../clang/bin/clang++
-    export LLVMCONFIG=$topsrcdir/../clang/bin/llvm-config
-    export DSYMUTIL=$topsrcdir/../clang/bin/llvm-dsymutil
-    # Use an updated linker.
-    ldflags="-B$topsrcdir/../cctools/bin"
-fi
-
-# Ensure the updated linker doesn't generate things our older build tools
-# don't understand.
-ldflags="$ldflags -Wl,-no_data_in_code_info"
-export LDFLAGS="$ldflags"
-
-# If not set use the system default clang
-if [ -z "$CC" ]; then
-    export CC=clang
-fi
-
-# If not set use the system default clang++
-if [ -z "$CXX" ]; then
-    export CXX=clang++
-fi
-
-export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
diff --git a/build/macosx/mozconfig.common b/build/macosx/mozconfig.common
deleted file mode 100644
index 27634b7f3..000000000
--- a/build/macosx/mozconfig.common
+++ /dev/null
@@ -1,5 +0,0 @@
-if test `uname -s` = Linux; then
-  . $topsrcdir/build/macosx/cross-mozconfig.common
-else
-  . $topsrcdir/build/macosx/local-mozconfig.common
-fi
diff --git a/build/macosx/universal/check-sync-exceptions b/build/macosx/universal/check-sync-exceptions
deleted file mode 100644
index fc5149281..000000000
--- a/build/macosx/universal/check-sync-exceptions
+++ /dev/null
@@ -1,9 +0,0 @@
-flight.mk
-mozconfig.common
-
-# Ignore detritus left lying around by editing tools.
-*~
-.#*
-#*#
-*.orig
-*.rej
diff --git a/build/macosx/universal/flight.mk b/build/macosx/universal/flight.mk
deleted file mode 100644
index 2b79ef7ae..000000000
--- a/build/macosx/universal/flight.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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/.
-
-# BE CAREFUL!  This makefile handles a postflight_all rule for a
-# multi-project build, so DON'T rely on anything that might differ between
-# the two OBJDIRs.
-
-ifndef OBJDIR
-OBJDIR_ARCH_1 = $(MOZ_OBJDIR)/$(firstword $(MOZ_BUILD_PROJECTS))
-OBJDIR_ARCH_2 = $(MOZ_OBJDIR)/$(word 2,$(MOZ_BUILD_PROJECTS))
-DIST_ARCH_1 = $(OBJDIR_ARCH_1)/dist
-DIST_ARCH_2 = $(OBJDIR_ARCH_2)/dist
-DIST_UNI = $(DIST_ARCH_1)/universal
-OBJDIR = $(OBJDIR_ARCH_1)
-endif
-
-topsrcdir = $(TOPSRCDIR)
-DEPTH = $(OBJDIR)
-include $(OBJDIR)/config/autoconf.mk
-
-core_abspath = $(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1))
-
-DIST = $(OBJDIR)/dist
-
-postflight_all:
-	mkdir -p $(DIST_UNI)/$(MOZ_PKG_APPNAME)
-	rm -f $(DIST_ARCH_2)/universal
-	ln -s $(abspath $(DIST_UNI)) $(DIST_ARCH_2)/universal
-# Stage a package for buildsymbols to be happy. Doing so in OBJDIR_ARCH_1
-# actually does a universal staging with both OBJDIR_ARCH_1 and OBJDIR_ARCH_2.
-	$(MAKE) -C $(OBJDIR_ARCH_1)/$(subst ../,,$(MOZ_BUILD_APP))/installer \
-	   PKG_SKIP_STRIP=1 stage-package
diff --git a/build/macosx/universal/mozconfig b/build/macosx/universal/mozconfig
deleted file mode 100644
index 32ab66f2d..000000000
--- a/build/macosx/universal/mozconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/.
-
-# i386/x86-64 Universal Build mozconfig
-
-# As used here, arguments in $MOZ_BUILD_PROJECTS are suitable as arguments
-# to gcc's -arch parameter.
-mk_add_options MOZ_BUILD_PROJECTS="x86_64 i386"
-
-. $topsrcdir/build/macosx/universal/mozconfig.common
diff --git a/build/macosx/universal/mozconfig.common b/build/macosx/universal/mozconfig.common
deleted file mode 100644
index 518274b51..000000000
--- a/build/macosx/universal/mozconfig.common
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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/.
-
-mk_add_options MOZ_UNIFY_BDATE=1
-
-mk_add_options MOZ_POSTFLIGHT_ALL+=build/macosx/universal/flight.mk
-
-DARWIN_VERSION=`uname -r`
-ac_add_app_options i386 --target=i386-apple-darwin$DARWIN_VERSION
-ac_add_app_options x86_64 --target=x86_64-apple-darwin$DARWIN_VERSION
-ac_add_app_options i386 --with-unify-dist=../x86_64/dist
-ac_add_app_options x86_64 --with-unify-dist=../i386/dist
-
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.7.sdk
-
-. $topsrcdir/build/macosx/mozconfig.common
-
-# $MOZ_BUILD_APP is only defined when sourced by configure.  That's not a
-# problem, because the variables it affects only need to be set for
-# configure.
-if test -n "$MOZ_BUILD_APP" ; then
-if test "$MOZ_BUILD_APP" = "i386" -o "$MOZ_BUILD_APP" = "x86_64"; then
-  TARGET_CPU=$MOZ_BUILD_APP
-
-  # $HOST_CXX is presently unused.  $HOST_CC will only be used during a cross
-  # compile.
-  HOST_CC=$CC
-  HOST_CXX=$CXX
-
-  NATIVE_CPU=`$topsrcdir/build/autoconf/config.guess | cut -f1 -d-`
-
-  # It's not strictly necessary to specify -arch during native builds, but it
-  # makes the merged about:buildconfig easier to follow, and it reduces
-  # conditionalized differences between builds.
-  CC="$CC -arch $TARGET_CPU"
-  CXX="$CXX -arch $TARGET_CPU"
-
-  # These must be set for cross builds, and don't hurt straight builds.
-  RANLIB=ranlib
-  AR=ar
-  AS=$CC
-  LD=ld
-  STRIP="strip"
-  OTOOL="otool"
-
-  # Each per-CPU build should be entirely oblivious to the fact that a
-  # universal binary will be produced.  The exception is packager.mk, which
-  # needs to know to look for universal bits when building the .dmg.
-  UNIVERSAL_BINARY=1
-
-  export CC CXX HOST_CC HOST_CXX RANLIB AR AS LD STRIP OTOOL
-fi
-fi
diff --git a/build/mozconfig.rust b/build/mozconfig.rust
deleted file mode 100644
index 65177a6bd..000000000
--- a/build/mozconfig.rust
+++ /dev/null
@@ -1,10 +0,0 @@
-# Options to enable rust in automation builds.
-
-# Tell configure to use the tooltool rustc.
-# Assume this is compiled with --enable-rpath so we don't
-# have to set LD_LIBRARY_PATH.
-RUSTC="$topsrcdir/rustc/bin/rustc"
-CARGO="$topsrcdir/cargo/bin/cargo"
-
-# Enable rust in the build.
-ac_add_options --enable-rust
diff --git a/build/mozconfig.vs-common b/build/mozconfig.vs-common
deleted file mode 100644
index ca5df2f3a..000000000
--- a/build/mozconfig.vs-common
+++ /dev/null
@@ -1,4 +0,0 @@
-# Pymake needs Windows-style paths. Use cmd.exe to hack around this.

-mk_export_correct_style() {

-  mk_add_options "export $1=$(cmd.exe //c echo %$1%)"

-}

diff --git a/build/mozconfig.win-common b/build/mozconfig.win-common
deleted file mode 100644
index 6e25b7ce4..000000000
--- a/build/mozconfig.win-common
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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/.
-
-if [ "x$IS_NIGHTLY" = "xyes" ]; then
-  # Some nightlies (eg: Mulet) don't want these set.
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
-  MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
-  MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
-fi
-
-# Some builds (eg: Mulet) don't want the installer, so only set this if it
-# hasn't already been set.
-MOZ_AUTOMATION_INSTALLER=${MOZ_AUTOMATION_INSTALLER-1}
-
-export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=c:/builds/crash-stats-api.token
diff --git a/build/unix/mozconfig.gtk b/build/unix/mozconfig.gtk
deleted file mode 100644
index 6f535f8a7..000000000
--- a/build/unix/mozconfig.gtk
+++ /dev/null
@@ -1,28 +0,0 @@
-# To do try builds with Gtk+2, uncomment the following line, and remove
-# everything after that.
-#ac_add_options --enable-default-toolkit=cairo-gtk2
-
-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"
diff --git a/build/unix/mozconfig.linux b/build/unix/mozconfig.linux
deleted file mode 100644
index f63f406e6..000000000
--- a/build/unix/mozconfig.linux
+++ /dev/null
@@ -1,38 +0,0 @@
-if [ "x$IS_NIGHTLY" = "xyes" ]; then
-  # Some nightlies (eg: Mulet) don't want these set.
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
-  MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
-  MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
-fi
-
-. "$topsrcdir/build/mozconfig.common"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
-
-# some b2g desktop builds still happen on i686 machines, and the tooltool
-# toolchain is x86_64 only.
-# We also deal with valgrind builds here, they don't use tooltool manifests at
-# all yet.
-if [ -z "$no_tooltool" ]
-then
-  CC="$TOOLTOOL_DIR/gcc/bin/gcc"
-  CXX="$TOOLTOOL_DIR/gcc/bin/g++"
-
-  # We want to make sure we use binutils and other binaries in the tooltool
-  # package.
-  mk_add_options PATH="$TOOLTOOL_DIR/gcc/bin:$PATH"
-else
-  CC="/tools/gcc-4.7.3-0moz1/bin/gcc"
-  CXX="/tools/gcc-4.7.3-0moz1/bin/g++"
-fi
-
-ac_add_options --enable-elf-hack
-
-. "$topsrcdir/build/unix/mozconfig.stdcxx"
-
-# PKG_CONFIG_LIBDIR is appropriately overridden in mozconfig.linux32
-export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
-
-export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
-
-. "$topsrcdir/build/unix/mozconfig.gtk"
diff --git a/build/unix/mozconfig.linux32 b/build/unix/mozconfig.linux32
deleted file mode 100644
index 309767751..000000000
--- a/build/unix/mozconfig.linux32
+++ /dev/null
@@ -1,12 +0,0 @@
-. "$topsrcdir/build/unix/mozconfig.linux"
-
-export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
-
-if test `uname -m` = "x86_64"; then
-  # -march=pentiumpro is what our 32-bit native toolchain defaults to
-  CC="$CC -m32 -march=pentiumpro"
-  CXX="$CXX -m32 -march=pentiumpro"
-  ac_add_options --target=i686-pc-linux
-  ac_add_options --host=i686-pc-linux
-  ac_add_options --x-libraries=/usr/lib
-fi
diff --git a/build/unix/mozconfig.stdcxx b/build/unix/mozconfig.stdcxx
deleted file mode 100644
index 787e9b443..000000000
--- a/build/unix/mozconfig.stdcxx
+++ /dev/null
@@ -1,15 +0,0 @@
-# Avoid dependency on libstdc++ 4.7
-ac_add_options --enable-stdcxx-compat
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
-
-if [ -f "$TOOLTOOL_DIR/clang/lib/libstdc++.so" ]; then
-  LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOOLTOOL_DIR/clang/lib
-elif [ -f "$TOOLTOOL_DIR/gcc/lib/libstdc++.so" ]; then
-  # We put both 32-bits and 64-bits library path in LD_LIBRARY_PATH: ld.so
-  # will prefer the files in the 32-bits path when loading 32-bits executables,
-  # and the files in the 64-bits path when loading 64-bits executables.
-  LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOOLTOOL_DIR/gcc/lib64:$TOOLTOOL_DIR/gcc/lib
-fi
-
-mk_add_options "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
diff --git a/build/win32/mozconfig.vs-latest b/build/win32/mozconfig.vs-latest
deleted file mode 100644
index 9c8726a8d..000000000
--- a/build/win32/mozconfig.vs-latest
+++ /dev/null
@@ -1 +0,0 @@
-. $topsrcdir/build/win32/mozconfig.vs2015-win64
diff --git a/build/win32/mozconfig.vs2015-win64 b/build/win32/mozconfig.vs2015-win64
deleted file mode 100644
index b81afa681..000000000
--- a/build/win32/mozconfig.vs2015-win64
+++ /dev/null
@@ -1,25 +0,0 @@
-if [ -z "${VSPATH}" ]; then
-    TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
-    VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2015u3"
-fi
-
-VSWINPATH="$(cd ${VSPATH} && pwd -W)"
-
-export WINDOWSSDKDIR="${VSWINPATH}/SDK"
-export WIN32_REDIST_DIR="${VSPATH}/VC/redist/x86/Microsoft.VC140.CRT"
-export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/x86"
-
-export PATH="${VSPATH}/VC/bin/amd64_x86:${VSPATH}/VC/bin/amd64:${VSPATH}/VC/bin:${VSPATH}/SDK/bin/x86:${VSPATH}/SDK/bin/x64:${VSPATH}/DIA SDK/bin:${PATH}"
-export PATH="${VSPATH}/VC/redist/x86/Microsoft.VC140.CRT:${VSPATH}/VC/redist/x64/Microsoft.VC140.CRT:${VSPATH}/SDK/Redist/ucrt/DLLs/x86:${VSPATH}/SDK/Redist/ucrt/DLLs/x64:${PATH}"
-
-export INCLUDE="${VSPATH}/VC/include:${VSPATH}/VC/atlmfc/include:${VSPATH}/SDK/Include/10.0.14393.0/ucrt:${VSPATH}/SDK/Include/10.0.14393.0/shared:${VSPATH}/SDK/Include/10.0.14393.0/um:${VSPATH}/SDK/Include/10.0.14393.0/winrt:${VSPATH}/DIA SDK/include"
-export LIB="${VSPATH}/VC/lib:${VSPATH}/VC/atlmfc/lib:${VSPATH}/SDK/lib/10.0.14393.0/ucrt/x86:${VSPATH}/SDK/lib/10.0.14393.0/um/x86:${VSPATH}/DIA SDK/lib"
-
-. $topsrcdir/build/mozconfig.vs-common
-
-mk_export_correct_style WINDOWSSDKDIR
-mk_export_correct_style INCLUDE
-mk_export_correct_style LIB
-mk_export_correct_style PATH
-mk_export_correct_style WIN32_REDIST_DIR
-mk_export_correct_style WIN_UCRT_REDIST_DIR
diff --git a/build/win64/mozconfig.vs-latest b/build/win64/mozconfig.vs-latest
deleted file mode 100644
index 3470d4ace..000000000
--- a/build/win64/mozconfig.vs-latest
+++ /dev/null
@@ -1 +0,0 @@
-. $topsrcdir/build/win64/mozconfig.vs2015
diff --git a/build/win64/mozconfig.vs2015 b/build/win64/mozconfig.vs2015
deleted file mode 100644
index e81a00064..000000000
--- a/build/win64/mozconfig.vs2015
+++ /dev/null
@@ -1,24 +0,0 @@
-if [ -z "${VSPATH}" ]; then
-    TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
-    VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2015u3"
-fi
-
-VSWINPATH="$(cd ${VSPATH} && pwd -W)"
-
-export WINDOWSSDKDIR="${VSWINPATH}/SDK"
-export WIN32_REDIST_DIR=${VSPATH}/VC/redist/x64/Microsoft.VC140.CRT
-export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/x64"
-
-export PATH="${VSPATH}/VC/bin/amd64:${VSPATH}/VC/bin:${VSPATH}/SDK/bin/x64:${VSPATH}/VC/redist/x64/Microsoft.VC140.CRT:${VSPATH}/SDK/Redist/ucrt/DLLs/x64:${VSPATH}/DIA SDK/bin/amd64:${PATH}"
-
-export INCLUDE="${VSPATH}/VC/include:${VSPATH}/VC/atlmfc/include:${VSPATH}/SDK/Include/10.0.14393.0/ucrt:${VSPATH}/SDK/Include/10.0.14393.0/shared:${VSPATH}/SDK/Include/10.0.14393.0/um:${VSPATH}/SDK/Include/10.0.14393.0/winrt:${VSPATH}/DIA SDK/include"
-export LIB="${VSPATH}/VC/lib/amd64:${VSPATH}/VC/atlmfc/lib/amd64:${VSPATH}/SDK/lib/10.0.14393.0/ucrt/x64:${VSPATH}/SDK/lib/10.0.14393.0/um/x64:${VSPATH}/DIA SDK/lib/amd64"
-
-. $topsrcdir/build/mozconfig.vs-common
-
-mk_export_correct_style WINDOWSSDKDIR
-mk_export_correct_style INCLUDE
-mk_export_correct_style LIB
-mk_export_correct_style PATH
-mk_export_correct_style WIN32_REDIST_DIR
-mk_export_correct_style WIN_UCRT_REDIST_DIR
diff --git a/mail/config/mozconfigs/linux32/debug b/mail/config/mozconfigs/linux32/debug
deleted file mode 100644
index 1ec9ac967..000000000
--- a/mail/config/mozconfigs/linux32/debug
+++ /dev/null
@@ -1,25 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-debug
-ac_add_options --enable-calendar
-
-. $topsrcdir/build/unix/mozconfig.linux32
-
-# 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_ADDON_SIGNING=0
-
-# Package js shell
-export MOZ_PACKAGE_JSSHELL=1
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/mail/config/mozconfigs/linux32/l10n-mozconfig b/mail/config/mozconfigs/linux32/l10n-mozconfig
deleted file mode 100644
index 3217b2848..000000000
--- a/mail/config/mozconfigs/linux32/l10n-mozconfig
+++ /dev/null
@@ -1,27 +0,0 @@
-. $topsrcdir/build/unix/mozconfig.linux32
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-l10n-base=../../l10n
-# The compile environment is needed for Linux, see bug 1349300 and bug 1311045.
-# ac_add_options --disable-compile-environment
-
-# Build lightning locales
-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_ADDON_SIGNING=0
-
-ac_add_options --disable-stdcxx-compat
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-l10n-args ] && cat $topsrcdir/build/client.py-l10n-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/linux32/nightly b/mail/config/mozconfigs/linux32/nightly
deleted file mode 100644
index d50b346e9..000000000
--- a/mail/config/mozconfigs/linux32/nightly
+++ /dev/null
@@ -1,27 +0,0 @@
-. $topsrcdir/build/unix/mozconfig.linux32
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-calendar
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=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_ADDON_SIGNING=0
-
-# Package js shell
-export MOZ_PACKAGE_JSSHELL=1
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/mail/config/mozconfigs/linux32/release b/mail/config/mozconfigs/linux32/release
deleted file mode 100644
index 68812287d..000000000
--- a/mail/config/mozconfigs/linux32/release
+++ /dev/null
@@ -1,26 +0,0 @@
-. $topsrcdir/build/unix/mozconfig.linux32
-
-ac_add_options --enable-application=mail
-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
-
-export MOZ_TELEMETRY_REPORTING=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_ADDON_SIGNING=0
-
-# Package js shell
-export MOZ_PACKAGE_JSSHELL=1
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/linux64/debug b/mail/config/mozconfigs/linux64/debug
deleted file mode 100644
index d59b279a1..000000000
--- a/mail/config/mozconfigs/linux64/debug
+++ /dev/null
@@ -1,25 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-debug
-ac_add_options --enable-calendar
-
-. $topsrcdir/build/unix/mozconfig.linux
-
-# 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_ADDON_SIGNING=0
-
-# Package js shell
-export MOZ_PACKAGE_JSSHELL=1
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/mail/config/mozconfigs/linux64/l10n-mozconfig b/mail/config/mozconfigs/linux64/l10n-mozconfig
deleted file mode 100644
index b6b9cb4b2..000000000
--- a/mail/config/mozconfigs/linux64/l10n-mozconfig
+++ /dev/null
@@ -1,27 +0,0 @@
-. $topsrcdir/build/unix/mozconfig.linux
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-l10n-base=../../l10n
-# The compile environment is needed for Linux, see bug 1349300 and bug 1311045.
-# ac_add_options --disable-compile-environment
-
-# Build lightning locales
-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_ADDON_SIGNING=0
-
-ac_add_options --disable-stdcxx-compat
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-l10n-args ] && cat $topsrcdir/build/client.py-l10n-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/linux64/nightly b/mail/config/mozconfigs/linux64/nightly
deleted file mode 100644
index 5abfadff2..000000000
--- a/mail/config/mozconfigs/linux64/nightly
+++ /dev/null
@@ -1,27 +0,0 @@
-. $topsrcdir/build/unix/mozconfig.linux
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-calendar
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=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_ADDON_SIGNING=0
-
-# Package js shell
-export MOZ_PACKAGE_JSSHELL=1
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/mail/config/mozconfigs/linux64/release b/mail/config/mozconfigs/linux64/release
deleted file mode 100644
index 4221d5814..000000000
--- a/mail/config/mozconfigs/linux64/release
+++ /dev/null
@@ -1,26 +0,0 @@
-. $topsrcdir/build/unix/mozconfig.linux
-
-ac_add_options --enable-application=mail
-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
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=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_ADDON_SIGNING=0
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/linux64/source b/mail/config/mozconfigs/linux64/source
deleted file mode 100644
index 78a7b1a68..000000000
--- a/mail/config/mozconfigs/linux64/source
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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=mail
-ac_add_options --enable-calendar
-
-# Run client.py (needed so that mozilla-* is included in the source tarball)
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/macosx-universal/l10n-mozconfig b/mail/config/mozconfigs/macosx-universal/l10n-mozconfig
deleted file mode 100644
index a0719429a..000000000
--- a/mail/config/mozconfigs/macosx-universal/l10n-mozconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --disable-install-strip
-ac_add_options --with-l10n-base=../../../l10n
-ac_add_options --disable-compile-environment
-
-# Build lightning locales
-ac_add_options --enable-calendar
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-
-# 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_ADDON_SIGNING=0
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-l10n-args ] && cat $topsrcdir/build/client.py-l10n-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/macosx-universal/nightly b/mail/config/mozconfigs/macosx-universal/nightly
deleted file mode 100644
index 3d220a2e7..000000000
--- a/mail/config/mozconfigs/macosx-universal/nightly
+++ /dev/null
@@ -1,42 +0,0 @@
-# Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-# mixed up with host/target CPUs when trying to work out how to do the
-# universal build. When we redo the build system (bug 648979) this will
-# go away.
-if test -e "$topsrcdir/mail/config/version.txt"; then
-  unset CC
-  unset CXX
-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
-
-# Universal builds override the default of mail (bug 575283 comment 29)
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --disable-install-strip
-ac_add_options --enable-calendar
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=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_ADDON_SIGNING=0
-
-ac_add_options --with-ccache
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/macosx-universal/release b/mail/config/mozconfigs/macosx-universal/release
deleted file mode 100644
index fd56fe13a..000000000
--- a/mail/config/mozconfigs/macosx-universal/release
+++ /dev/null
@@ -1,40 +0,0 @@
-# Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-# mixed up with host/target CPUs when trying to work out how to do the
-# universal build. When we redo the build system (bug 648979) this will
-# go away.
-if test -e "$topsrcdir/mail/config/version.txt"; then
-  unset CC
-  unset CXX
-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
-
-# Universal builds override the default of mail (bug 575283 comment 29)
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-official-branding
-ac_add_options --enable-calendar
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=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_ADDON_SIGNING=0
-
-# Package js shell
-export MOZ_PACKAGE_JSSHELL=1
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/macosx64/debug b/mail/config/mozconfigs/macosx64/debug
deleted file mode 100644
index 76df3d452..000000000
--- a/mail/config/mozconfigs/macosx64/debug
+++ /dev/null
@@ -1,25 +0,0 @@
-. $topsrcdir/build/macosx/mozconfig.common
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-debug
-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_ADDON_SIGNING=0
-
-# Package js shell
-export MOZ_PACKAGE_JSSHELL=1
-
-ac_add_options --with-ccache
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/macosx64/l10n-mozconfig b/mail/config/mozconfigs/macosx64/l10n-mozconfig
deleted file mode 100644
index 7b68b0624..000000000
--- a/mail/config/mozconfigs/macosx64/l10n-mozconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-. $topsrcdir/build/mozconfig.common
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --disable-install-strip
-ac_add_options --enable-profiling
-ac_add_options --with-l10n-base=../../l10n
-ac_add_options --disable-compile-environment
-
-# Build lightning locales
-ac_add_options --enable-calendar
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-
-# 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_ADDON_SIGNING=0
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-l10n-args ] && cat $topsrcdir/build/client.py-l10n-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/win32/debug b/mail/config/mozconfigs/win32/debug
deleted file mode 100644
index e6eb447f0..000000000
--- a/mail/config/mozconfigs/win32/debug
+++ /dev/null
@@ -1,31 +0,0 @@
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/build/mozconfig.common"
-
-ac_add_options --enable-application=mail
-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_ADDON_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
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/win32/l10n-mozconfig b/mail/config/mozconfigs/win32/l10n-mozconfig
deleted file mode 100644
index 6a4031e37..000000000
--- a/mail/config/mozconfigs/win32/l10n-mozconfig
+++ /dev/null
@@ -1,30 +0,0 @@
-. "$topsrcdir/build/mozconfig.common"
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-l10n-base=../../l10n
-ac_add_options --disable-compile-environment
-
-# 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_ADDON_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
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-l10n-args ] && cat $topsrcdir/build/client.py-l10n-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/win32/nightly b/mail/config/mozconfigs/win32/nightly
deleted file mode 100644
index 301d0d3db..000000000
--- a/mail/config/mozconfigs/win32/nightly
+++ /dev/null
@@ -1,34 +0,0 @@
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/build/mozconfig.common"
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-jemalloc
-ac_add_options --enable-require-all-d3dc-versions
-ac_add_options --enable-calendar
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-export MOZ_TELEMETRY_REPORTING=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_ADDON_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
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/win32/release b/mail/config/mozconfigs/win32/release
deleted file mode 100644
index 4dc308b48..000000000
--- a/mail/config/mozconfigs/win32/release
+++ /dev/null
@@ -1,35 +0,0 @@
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/build/mozconfig.common"
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-jemalloc
-ac_add_options --enable-require-all-d3dc-versions
-ac_add_options --enable-official-branding
-ac_add_options --enable-calendar
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-export MOZ_TELEMETRY_REPORTING=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_ADDON_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
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/win64/debug b/mail/config/mozconfigs/win64/debug
deleted file mode 100644
index 42a77f1ee..000000000
--- a/mail/config/mozconfigs/win64/debug
+++ /dev/null
@@ -1,30 +0,0 @@
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/build/mozconfig.common"
-
-ac_add_options --target=x86_64-pc-mingw32
-ac_add_options --host=x86_64-pc-mingw32
-
-ac_add_options --enable-application=mail
-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
-
-# 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_ADDON_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
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/win64/l10n-mozconfig b/mail/config/mozconfigs/win64/l10n-mozconfig
deleted file mode 100644
index 1102a9c55..000000000
--- a/mail/config/mozconfigs/win64/l10n-mozconfig
+++ /dev/null
@@ -1,29 +0,0 @@
-. "$topsrcdir/build/mozconfig.common"
-
-ac_add_options --target=x86_64-pc-mingw32
-ac_add_options --host=x86_64-pc-mingw32
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --disable-compile-environment
-
-# 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_ADDON_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
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/win64/nightly b/mail/config/mozconfigs/win64/nightly
deleted file mode 100644
index 2a8fa8d97..000000000
--- a/mail/config/mozconfigs/win64/nightly
+++ /dev/null
@@ -1,33 +0,0 @@
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/build/mozconfig.common"
-
-ac_add_options --target=x86_64-pc-mingw32
-ac_add_options --host=x86_64-pc-mingw32
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-jemalloc
-ac_add_options --enable-calendar
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=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_ADDON_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
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/tooltool-manifests/linux32/clang.manifest b/mail/config/tooltool-manifests/linux32/clang.manifest
deleted file mode 100644
index 07173985c..000000000
--- a/mail/config/tooltool-manifests/linux32/clang.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-{
-"version": "clang 3.8.0, libgcc 4.8.5",
-"size": 140319580,
-"digest": "34e219d7e8eaffa81710631c34d21355563d06335b3c00851e94c1f42f9098788fded8463dd0f67dd699f77b47a0245dd7aff754943a7a03fb5fd145a808254f",
-"algorithm": "sha512", 
-"filename": "clang.tar.xz",
-"unpack": true,
-}
-]
diff --git a/mail/config/tooltool-manifests/linux32/releng.manifest b/mail/config/tooltool-manifests/linux32/releng.manifest
deleted file mode 100644
index fc946eadf..000000000
--- a/mail/config/tooltool-manifests/linux32/releng.manifest
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-{
-"version": "gcc 4.8.5 + PR64905",
-"size": 80160264,
-"digest": "c1a9dc9da289b8528874d16300b9d13a997cec99195bb0bc46ff665216d8535d6d6cb5af6b4b1f2749af6815dab12e703fdb3849014e5c23a70eff351a0baf4e",
-"algorithm": "sha512", 
-"filename": "gcc.tar.xz",
-"unpack": true
-},
-{
-"size": 11189216,
-"digest": "18bc52b0599b1308b667e282abb45f47597bfc98a5140cfcab8da71dacf89dd76d0dee22a04ce26fe7ad1f04e2d6596991f9e5b01fd2aaaab5542965f596b0e6",
-"algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"setup": "setup.sh",
-"unpack": true
-},
-{
-"version": "rustc 1.13.0 (2c6933acc 2016-11-07) repack x86_64+i586",
-"size": 68921028,
-"digest": "9a9ceccc02d4be445ffa64617683419a4f47990b1f2689980ac8db13d6369435ef4af1a3714d77377fb7b3b0ec213856ab7144ff22cbe0881d49aed44d82c0fc",
-"algorithm": "sha512",
-"filename": "rustc.tar.xz",
-"unpack": true
-},
-{
-"version": "cargo 0.13.0-nightly (eca9e15 2016-11-01) repack",
-"size": 3027932,
-"digest": "a5c99eeb12b3b9b49632c259c762e34ec13cf72dadf90a0608b8ab1dc66b36cb114c5b45f71d326e12d31d9e88a41b029e6a728ca64cef392c0a8d211c2fe191",
-"algorithm": "sha512",
-"filename": "cargo.tar.xz",
-"unpack": true
-},
-{
-"size": 167175,
-"digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
-"algorithm": "sha512",
-"filename": "sccache.tar.bz2",
-"unpack": true
-}
-]
diff --git a/mail/config/tooltool-manifests/linux64/asan.manifest b/mail/config/tooltool-manifests/linux64/asan.manifest
deleted file mode 100644
index 9642de0b0..000000000
--- a/mail/config/tooltool-manifests/linux64/asan.manifest
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-{
-"version": "gcc 4.8.5 + PR64905",
-"size": 80160264,
-"digest": "c1a9dc9da289b8528874d16300b9d13a997cec99195bb0bc46ff665216d8535d6d6cb5af6b4b1f2749af6815dab12e703fdb3849014e5c23a70eff351a0baf4e",
-"algorithm": "sha512",
-"filename": "gcc.tar.xz",
-"unpack": true
-},
-{
-"version": "clang 3.8.0, libgcc 4.8.5",
-"size": 139183100,
-"digest": "a056a151d4f25f415b6d905136c3fa8d51d12a5a815c3df37d5663c67d59571736641a4c990884a69f78ea6b5e37a6a7bfff0417dfe38936d842d6fa0776ae54",
-"algorithm": "sha512",
-"filename": "clang.tar.xz",
-"unpack": true
-},
-{
-"size": 12072532,
-"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
-"algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"setup": "setup.sh",
-"unpack": true
-}
-]
diff --git a/mail/config/tooltool-manifests/linux64/clang.manifest b/mail/config/tooltool-manifests/linux64/clang.manifest
deleted file mode 100644
index 97496f2c2..000000000
--- a/mail/config/tooltool-manifests/linux64/clang.manifest
+++ /dev/null
@@ -1,25 +0,0 @@
-[
-{
-"version": "clang 3.8.0, libgcc 4.8.5",
-"size": 140319580,
-"digest": "34e219d7e8eaffa81710631c34d21355563d06335b3c00851e94c1f42f9098788fded8463dd0f67dd699f77b47a0245dd7aff754943a7a03fb5fd145a808254f",
-"algorithm": "sha512",
-"filename": "clang.tar.xz",
-"unpack": true
-},
-{
-"size": 12072532,
-"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
-"algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"setup": "setup.sh",
-"unpack": true
-},
-{
-"size": 167175,
-"digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
-"algorithm": "sha512",
-"filename": "sccache.tar.bz2",
-"unpack": true
-}
-]
diff --git a/mail/config/tooltool-manifests/linux64/releng.manifest b/mail/config/tooltool-manifests/linux64/releng.manifest
deleted file mode 100644
index eb7293cee..000000000
--- a/mail/config/tooltool-manifests/linux64/releng.manifest
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-{
-"version": "gcc 4.8.5 + PR64905",
-"size": 80160264,
-"digest": "c1a9dc9da289b8528874d16300b9d13a997cec99195bb0bc46ff665216d8535d6d6cb5af6b4b1f2749af6815dab12e703fdb3849014e5c23a70eff351a0baf4e",
-"algorithm": "sha512", 
-"filename": "gcc.tar.xz",
-"unpack": true
-},
-{
-"size": 12072532,
-"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
-"algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"setup": "setup.sh",
-"unpack": true
-},
-{
-"version": "rustc 1.13.0 (2c6933acc 2016-11-07) repack",
-"size": 68921028,
-"digest": "9a9ceccc02d4be445ffa64617683419a4f47990b1f2689980ac8db13d6369435ef4af1a3714d77377fb7b3b0ec213856ab7144ff22cbe0881d49aed44d82c0fc",
-"algorithm": "sha512",
-"filename": "rustc.tar.xz",
-"unpack": true
-},
-{
-"version": "cargo 0.13.0-nightly (eca9e15 2016-11-01) repack",
-"size": 3027932,
-"digest": "a5c99eeb12b3b9b49632c259c762e34ec13cf72dadf90a0608b8ab1dc66b36cb114c5b45f71d326e12d31d9e88a41b029e6a728ca64cef392c0a8d211c2fe191",
-"algorithm": "sha512",
-"filename": "cargo.tar.xz",
-"unpack": true
-},
-{
-"size": 167175,
-"digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
-"algorithm": "sha512",
-"filename": "sccache.tar.bz2",
-"unpack": true
-}
-]
diff --git a/mail/config/tooltool-manifests/macosx64/asan.manifest b/mail/config/tooltool-manifests/macosx64/asan.manifest
deleted file mode 100644
index e00596925..000000000
--- a/mail/config/tooltool-manifests/macosx64/asan.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-{
-"version": "clang 3.8.0",
-"size": 133060926,
-"digest": "aff5ad3ac2d41db19d1ba0df5f97b189a7d7e1b6af8c56e22c2b0cced84d75fa98394ded6a4ba5713652e6684a0a46f47aeccf87991f9e849bf8d7d82e564f6f",
-"algorithm": "sha512", 
-"filename": "clang.tar.bz2",
-"unpack": true
-}
-]
diff --git a/mail/config/tooltool-manifests/macosx64/clang.manifest b/mail/config/tooltool-manifests/macosx64/clang.manifest
deleted file mode 100644
index a768012c4..000000000
--- a/mail/config/tooltool-manifests/macosx64/clang.manifest
+++ /dev/null
@@ -1,25 +0,0 @@
-[
-{
-"version": "clang 3.8.0",
-"size": 133060926,
-"digest": "aff5ad3ac2d41db19d1ba0df5f97b189a7d7e1b6af8c56e22c2b0cced84d75fa98394ded6a4ba5713652e6684a0a46f47aeccf87991f9e849bf8d7d82e564f6f",
-"algorithm": "sha512",
-"filename": "clang.tar.bz2",
-"unpack": true
-},
-{
-"size": 167175,
-"digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
-"algorithm": "sha512",
-"filename": "sccache.tar.bz2",
-"unpack": true
-},
-{
-"version": "cctools port from commit hash db1f8d906cb28, ld only",
-"size": 634496,
-"digest": "037f31fcf29e7bb7fada0d2bdd5e95c7d4cb2692f2a5c98ed6f6a7561b9d81622d015f0d12b291d3667719655f1369e8ce8a0a4a4773aa0ee4753e04a8821173",
-"algorithm": "sha512",
-"filename": "cctools.tar.bz2",
-"unpack": true
-}
-]
diff --git a/mail/config/tooltool-manifests/macosx64/releng.manifest b/mail/config/tooltool-manifests/macosx64/releng.manifest
deleted file mode 100644
index 98cccce71..000000000
--- a/mail/config/tooltool-manifests/macosx64/releng.manifest
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-{
-"version": "clang 3.8.0",
-"size": 133060926,
-"digest": "aff5ad3ac2d41db19d1ba0df5f97b189a7d7e1b6af8c56e22c2b0cced84d75fa98394ded6a4ba5713652e6684a0a46f47aeccf87991f9e849bf8d7d82e564f6f",
-"algorithm": "sha512",
-"filename": "clang.tar.bz2",
-"unpack": true
-},
-{
-"version": "rustc 1.13.0 (2c6933acc 2016-11-07) repack",
-"size": 104593379,
-"digest": "9cbc4a6d4d647dd79629e97c0e7b177443d30e669ccd761ab520728d8c2b7e1cc4ab38ec444c1957649338c4088861db3bfe4f840ec3fedcc01f9f1a74da200a",
-"algorithm": "sha512",
-"filename": "rustc.tar.bz2",
-"unpack": true
-},
-{
-"version": "cargo 0.13.0-nightly (eca9e15 2016-11-01) repack",
-"size": 2351877,
-"digest": "76283ceda49015f66b03d18b3c28f70ed4baa09accdfc17b2ec935c7af3e9471d140256a33737563baa2545c34e556a125ade6d4858b9226b8c770dbd7c0756f",
-"algorithm": "sha512",
-"filename": "cargo.tar.bz2",
-"unpack": true
-},
-{
-"version": "cctools port from commit hash db1f8d906cb28, ld only",
-"size": 634496,
-"digest": "037f31fcf29e7bb7fada0d2bdd5e95c7d4cb2692f2a5c98ed6f6a7561b9d81622d015f0d12b291d3667719655f1369e8ce8a0a4a4773aa0ee4753e04a8821173",
-"algorithm": "sha512",
-"filename": "cctools.tar.bz2",
-"unpack": true
-},
-{
-"size": 167175,
-"digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
-"algorithm": "sha512",
-"filename": "sccache.tar.bz2",
-"unpack": true
-}
-]
diff --git a/mail/config/tooltool-manifests/win32/l10n.manifest b/mail/config/tooltool-manifests/win32/l10n.manifest
deleted file mode 100644
index 2e802b78d..000000000
--- a/mail/config/tooltool-manifests/win32/l10n.manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-}
-]
diff --git a/mail/config/tooltool-manifests/win32/releng.manifest b/mail/config/tooltool-manifests/win32/releng.manifest
deleted file mode 100644
index 9124644f1..000000000
--- a/mail/config/tooltool-manifests/win32/releng.manifest
+++ /dev/null
@@ -1,39 +0,0 @@
-[
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-},
-{
-"version": "rustc 1.13.0 (2c6933acc 2016-11-07) repack",
-"size": 58997576,
-"digest": "be97bb7f60fea39b9b0411b7ce247036a9373b01ed8cc60f30ed3c6254473ab7ef1881f222f10845253e0608c6f3d21add0871d0485d9de413297906d5c5409c",
-"algorithm": "sha512",
-"filename": "rustc.tar.bz2",
-"unpack": true
-},
-{
-"version": "cargo 0.13.0-nightly (eca9e15 2016-11-01) repack",
-"size": 2214397,
-"digest": "4f378fc4178d72d9e0434fca3df342d9dd7619c7c524ec6aedeee78a19583f2a675dfc54224be87030d72a36cef77f997e5275fe1cebac065c38949fa464d842",
-"algorithm": "sha512",
-"filename": "cargo.tar.bz2",
-"unpack": true
-},
-{
-"size": 167175,
-"digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
-"algorithm": "sha512",
-"filename": "sccache.tar.bz2",
-"unpack": true
-},
-{
-"version": "Visual Studio 2015 Update 3 14.0.25425.01 / SDK 10.0.14393.0",
-"size": 326656969,
-"digest": "babc414ffc0457d27f5a1ed24a8e4873afbe2f1c1a4075469a27c005e1babc3b2a788f643f825efedff95b79686664c67ec4340ed535487168a3482e68559bc7",
-"algorithm": "sha512",
-"filename": "vs2015u3.zip",
-"unpack": true
-}
-]
diff --git a/mail/config/tooltool-manifests/win64/l10n.manifest b/mail/config/tooltool-manifests/win64/l10n.manifest
deleted file mode 100644
index 2e802b78d..000000000
--- a/mail/config/tooltool-manifests/win64/l10n.manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-}
-]
diff --git a/mail/config/tooltool-manifests/win64/releng.manifest b/mail/config/tooltool-manifests/win64/releng.manifest
deleted file mode 100644
index 207d8e5d0..000000000
--- a/mail/config/tooltool-manifests/win64/releng.manifest
+++ /dev/null
@@ -1,40 +0,0 @@
-[
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-},
-{
-"version": "rustc 1.13.0 (2c6933acc 2016-11-07) repack",
-"size": 63966131,
-"digest": "a431492ca5ae3454e7d5de3962ff0b40d96f69a9046428a1fe310397a5dda9ba2f6b697958e8386b119d56b700563ffe1b58c63f84b527b2df320893306854cf",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "rustc.tar.bz2",
-"unpack": true
-},
-{
-"version": "cargo 0.13.0-nightly (eca9e15 2016-11-01) repack",
-"size": 2466539,
-"digest": "78b129bd5c933d77c1f09a24c57a652c7cf228fc986000c162f892a46a53fc0f56b8fe1ac924c7e5aaefc4728fd07b679fbf149feb4ed5f2f30c4fd2f776ab7e",
-"algorithm": "sha512",
-"filename": "cargo.tar.bz2",
-"unpack": true
-},
-{
-"size": 167175,
-"digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
-"algorithm": "sha512",
-"filename": "sccache.tar.bz2",
-"unpack": true
-},
-{
-"version": "Visual Studio 2015 Update 3 14.0.25425.01 / SDK 10.0.14393.0",
-"size": 326656969,
-"digest": "babc414ffc0457d27f5a1ed24a8e4873afbe2f1c1a4075469a27c005e1babc3b2a788f643f825efedff95b79686664c67ec4340ed535487168a3482e68559bc7",
-"algorithm": "sha512",
-"filename": "vs2015u3.zip",
-"unpack": true
-}
-]