Revert "Add Basilisk"

This reverts commit e72ef92b5bdc43cd2584198e2e54e951b70299e8.
author: Matt A. Tobin <email@mattatobin.com> 2018-02-02 05:06:10 -0500
committer: Matt A. Tobin <email@mattatobin.com> 2018-02-02 05:06:10 -0500
commit: 6d614170cbfa958564eb5f824234ad5a9e484344 (patch)
tree: 3e1eb384382f30987cb2e64bd654afa8b74fd06b /application/basilisk/config
parent: 2a6b605d64b19411a300efdbbd7f78c349f90206 (diff)
download: UXP-6d614170cbfa958564eb5f824234ad5a9e484344.tar
UXP-6d614170cbfa958564eb5f824234ad5a9e484344.tar.gz
UXP-6d614170cbfa958564eb5f824234ad5a9e484344.tar.lz
UXP-6d614170cbfa958564eb5f824234ad5a9e484344.tar.xz
UXP-6d614170cbfa958564eb5f824234ad5a9e484344.zip
98 files changed, 0 insertions, 2012 deletions
diff --git a/application/basilisk/config/mozconfig b/application/basilisk/config/mozconfig
deleted file mode 100644
index ad2e3a4ea..000000000
--- a/application/basilisk/config/mozconfig
+++ /dev/null
@@ -1,9 +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/.
-
-# This file specifies the build flags for Firefox.  You can use it by adding:
-#  . $topsrcdir/browser/config/mozconfig
-# to the top of your mozconfig file.
-
-ac_add_options --enable-application=browser
diff --git a/application/basilisk/config/mozconfigs/common b/application/basilisk/config/mozconfigs/common
deleted file mode 100644
index febf5622f..000000000
--- a/application/basilisk/config/mozconfigs/common
+++ /dev/null
@@ -1,7 +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/.
-
-# This file is included by all browser mozconfigs
-
-. "$topsrcdir/build/mozconfig.common"
diff --git a/application/basilisk/config/mozconfigs/linux32/artifact b/application/basilisk/config/mozconfigs/linux32/artifact
deleted file mode 100644
index 560d86bb2..000000000
--- a/application/basilisk/config/mozconfigs/linux32/artifact
+++ /dev/null
@@ -1,8 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/browser/config/mozconfigs/linux32/common-opt"
-. "$topsrcdir/build/mozconfig.common.override"
-
-. "$topsrcdir/build/mozconfig.artifact"
-ac_add_options --enable-artifact-build-symbols
diff --git a/application/basilisk/config/mozconfigs/linux32/beta b/application/basilisk/config/mozconfigs/linux32/beta
deleted file mode 100644
index c9ad092a0..000000000
--- a/application/basilisk/config/mozconfigs/linux32/beta
+++ /dev/null
@@ -1,13 +0,0 @@
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/browser/config/mozconfigs/linux32/common-opt"
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-mk_add_options MOZ_PGO=1
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/application/basilisk/config/mozconfigs/linux32/common-opt b/application/basilisk/config/mozconfigs/linux32/common-opt
deleted file mode 100644
index 3bf3e530e..000000000
--- a/application/basilisk/config/mozconfigs/linux32/common-opt
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is sourced by nightly, beta, and release mozconfigs.
-
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-google-api-keyfile=/builds/gapi.data
-ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
-
-. $topsrcdir/build/unix/mozconfig.linux32
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
diff --git a/application/basilisk/config/mozconfigs/linux32/debug b/application/basilisk/config/mozconfigs/linux32/debug
deleted file mode 100644
index 542c20f2c..000000000
--- a/application/basilisk/config/mozconfigs/linux32/debug
+++ /dev/null
@@ -1,23 +0,0 @@
-ac_add_options --enable-debug
-ac_add_options --enable-dmd
-ac_add_options --enable-verify-mar
-
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. $topsrcdir/build/unix/mozconfig.linux32
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-#Use ccache
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/application/basilisk/config/mozconfigs/linux32/debug-artifact b/application/basilisk/config/mozconfigs/linux32/debug-artifact
deleted file mode 100644
index 52b49cee9..000000000
--- a/application/basilisk/config/mozconfigs/linux32/debug-artifact
+++ /dev/null
@@ -1,10 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/build/unix/mozconfig.linux32"
-. "$topsrcdir/build/mozconfig.common.override"
-
-. "$topsrcdir/build/mozconfig.artifact"
-ac_add_options --enable-artifact-build-symbols
-
-ac_add_options --enable-debug
diff --git a/application/basilisk/config/mozconfigs/linux32/debug-asan b/application/basilisk/config/mozconfigs/linux32/debug-asan
deleted file mode 100644
index 9fc7b9bff..000000000
--- a/application/basilisk/config/mozconfigs/linux32/debug-asan
+++ /dev/null
@@ -1,23 +0,0 @@
-# Use at least -O1 for optimization to avoid stack space
-# exhaustions caused by Clang function inlining.
-ac_add_options --enable-debug
-ac_add_options --enable-optimize="-O1"
-
-# ASan specific options on Linux
-ac_add_options --enable-valgrind
-
-. $topsrcdir/build/unix/mozconfig.asan
-
-export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
-. $topsrcdir/build/unix/mozconfig.gtk
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-# Need this to prevent name conflicts with the normal nightly build packages
-export MOZ_PKG_SPECIAL=asan
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/application/basilisk/config/mozconfigs/linux32/l10n-mozconfig b/application/basilisk/config/mozconfigs/linux32/l10n-mozconfig
deleted file mode 100644
index ae7cc933b..000000000
--- a/application/basilisk/config/mozconfigs/linux32/l10n-mozconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-no_sccache=1
-
-ac_add_options --with-l10n-base=../../l10n
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-official-branding
-
-. $topsrcdir/build/unix/mozconfig.linux32
-
-export MOZILLA_OFFICIAL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-ac_add_options --disable-stdcxx-compat
-
-# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
-# Bug 1283438
-mk_add_options AUTOCLOBBER=
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/application/basilisk/config/mozconfigs/linux32/nightly b/application/basilisk/config/mozconfigs/linux32/nightly
deleted file mode 100644
index d4f55cf6e..000000000
--- a/application/basilisk/config/mozconfigs/linux32/nightly
+++ /dev/null
@@ -1,14 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/linux32/common-opt"
-
-
-ac_add_options --enable-verify-mar
-
-# This will overwrite the default of stripping everything and keep the symbol table.
-# This is useful for profiling and debugging and only increases the package size
-# by 2 MBs.
-STRIP_FLAGS="--strip-debug"
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/application/basilisk/config/mozconfigs/linux32/nightly-asan b/application/basilisk/config/mozconfigs/linux32/nightly-asan
deleted file mode 100644
index 0930c184f..000000000
--- a/application/basilisk/config/mozconfigs/linux32/nightly-asan
+++ /dev/null
@@ -1,22 +0,0 @@
-# We still need to build with debug symbols
-ac_add_options --disable-debug
-ac_add_options --enable-optimize="-O2 -g"
-
-# ASan specific options on Linux
-ac_add_options --enable-valgrind
-
-. $topsrcdir/build/unix/mozconfig.asan
-
-export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
-. $topsrcdir/build/unix/mozconfig.gtk
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-# Need this to prevent name conflicts with the normal nightly build packages
-export MOZ_PKG_SPECIAL=asan
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/application/basilisk/config/mozconfigs/linux32/release b/application/basilisk/config/mozconfigs/linux32/release
deleted file mode 100644
index b742b1d45..000000000
--- a/application/basilisk/config/mozconfigs/linux32/release
+++ /dev/null
@@ -1,20 +0,0 @@
-# This make file should be identical to the beta mozconfig, apart from the
-# safeguard below
-
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/browser/config/mozconfigs/linux32/common-opt"
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-mk_add_options MOZ_PGO=1
-
-# safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
-# defines.sh during the beta cycle
-export BUILDING_RELEASE=1
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/application/basilisk/config/mozconfigs/linux32/valgrind b/application/basilisk/config/mozconfigs/linux32/valgrind
deleted file mode 100644
index 773a7ff5b..000000000
--- a/application/basilisk/config/mozconfigs/linux32/valgrind
+++ /dev/null
@@ -1,10 +0,0 @@
-. $topsrcdir/browser/config/mozconfigs/linux32/nightly
-
-ac_add_options --enable-valgrind
-ac_add_options --disable-jemalloc
-ac_add_options --disable-install-strip
-ac_add_options --disable-gtest-in-build
-
-# Include the override mozconfig again (even though the above includes it)
-# since it's supposed to override everything.
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/application/basilisk/config/mozconfigs/linux64/add-on-devel b/application/basilisk/config/mozconfigs/linux64/add-on-devel
deleted file mode 100644
index 0a3dfeb3f..000000000
--- a/application/basilisk/config/mozconfigs/linux64/add-on-devel
+++ /dev/null
@@ -1,9 +0,0 @@
-. $topsrcdir/browser/config/mozconfigs/linux64/nightly
-
-#add-on signing is checked but not enforced
-MOZ_REQUIRE_SIGNING=0
-ac_add_options --with-branding=browser/branding/unofficial
-ac_add_options --enable-update-channel=default
-
-# Need this to prevent name conflicts with the normal nightly build packages
-export MOZ_PKG_SPECIAL=add-on-devel
diff --git a/application/basilisk/config/mozconfigs/linux64/artifact b/application/basilisk/config/mozconfigs/linux64/artifact
deleted file mode 100644
index 51b82b384..000000000
--- a/application/basilisk/config/mozconfigs/linux64/artifact
+++ /dev/null
@@ -1,8 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
-. "$topsrcdir/build/mozconfig.common.override"
-
-. "$topsrcdir/build/mozconfig.artifact"
-ac_add_options --enable-artifact-build-symbols
diff --git a/application/basilisk/config/mozconfigs/linux64/beta b/application/basilisk/config/mozconfigs/linux64/beta
deleted file mode 100644
index 4c25d883a..000000000
--- a/application/basilisk/config/mozconfigs/linux64/beta
+++ /dev/null
@@ -1,13 +0,0 @@
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-mk_add_options MOZ_PGO=1
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/application/basilisk/config/mozconfigs/linux64/code-coverage b/application/basilisk/config/mozconfigs/linux64/code-coverage
deleted file mode 100644
index 48ffa9b17..000000000
--- a/application/basilisk/config/mozconfigs/linux64/code-coverage
+++ /dev/null
@@ -1,13 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/linux64/nightly"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
-
-ac_add_options --disable-install-strip
-ac_add_options --disable-jemalloc
-ac_add_options --disable-crashreporter
-ac_add_options --disable-elf-hack
-
-MOZ_CODE_COVERAGE=1
-export CFLAGS="-fprofile-arcs -ftest-coverage"
-export CXXFLAGS="-fprofile-arcs -ftest-coverage"
-export LDFLAGS="-fprofile-arcs -ftest-coverage -lgcov -L$TOOLTOOL_DIR/gtk3/usr/local/lib"
diff --git a/application/basilisk/config/mozconfigs/linux64/common-opt b/application/basilisk/config/mozconfigs/linux64/common-opt
deleted file mode 100644
index 0d605ff9e..000000000
--- a/application/basilisk/config/mozconfigs/linux64/common-opt
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is sourced by the nightly, beta, and release mozconfigs.
-
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-google-api-keyfile=/builds/gapi.data
-ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
-
-. $topsrcdir/build/unix/mozconfig.linux
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
diff --git a/application/basilisk/config/mozconfigs/linux64/debug b/application/basilisk/config/mozconfigs/linux64/debug
deleted file mode 100644
index 8196af81b..000000000
--- a/application/basilisk/config/mozconfigs/linux64/debug
+++ /dev/null
@@ -1,21 +0,0 @@
-ac_add_options --enable-debug
-ac_add_options --enable-dmd
-ac_add_options --enable-verify-mar
-
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. $topsrcdir/build/unix/mozconfig.linux
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/application/basilisk/config/mozconfigs/linux64/debug-artifact b/application/basilisk/config/mozconfigs/linux64/debug-artifact
deleted file mode 100644
index db0a435ff..000000000
--- a/application/basilisk/config/mozconfigs/linux64/debug-artifact
+++ /dev/null
@@ -1,11 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/build/unix/mozconfig.linux"
-. "$topsrcdir/build/mozconfig.common.override"
-
-. "$topsrcdir/build/mozconfig.artifact"
-ac_add_options --enable-artifact-build-symbols
-
-ac_add_options --enable-debug
-
diff --git a/application/basilisk/config/mozconfigs/linux64/debug-asan b/application/basilisk/config/mozconfigs/linux64/debug-asan
deleted file mode 100644
index a772dbb51..000000000
--- a/application/basilisk/config/mozconfigs/linux64/debug-asan
+++ /dev/null
@@ -1,23 +0,0 @@
-# Use at least -O1 for optimization to avoid stack space
-# exhaustions caused by Clang function inlining.
-ac_add_options --enable-debug
-ac_add_options --enable-optimize="-O1"
-
-# ASan specific options on Linux
-ac_add_options --enable-valgrind
-
-. $topsrcdir/build/unix/mozconfig.asan
-
-export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
-. $topsrcdir/build/unix/mozconfig.gtk
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-# Need this to prevent name conflicts with the normal nightly build packages
-export MOZ_PKG_SPECIAL=asan
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/application/basilisk/config/mozconfigs/linux64/debug-static-analysis-clang b/application/basilisk/config/mozconfigs/linux64/debug-static-analysis-clang
deleted file mode 100644
index ff41e13f9..000000000
--- a/application/basilisk/config/mozconfigs/linux64/debug-static-analysis-clang
+++ /dev/null
@@ -1,23 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_PACKAGE_TESTS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/build/mozconfig.common"
-
-ac_add_options --enable-debug
-ac_add_options --enable-dmd
-
-# Use Clang as specified in manifest
-export CC="$topsrcdir/clang/bin/clang"
-export CXX="$topsrcdir/clang/bin/clang++"
-
-# Add the static checker
-ac_add_options --enable-clang-plugin
-
-. "$topsrcdir/build/unix/mozconfig.stdcxx"
-
-export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
-. $topsrcdir/build/unix/mozconfig.gtk
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/application/basilisk/config/mozconfigs/linux64/hazards b/application/basilisk/config/mozconfigs/linux64/hazards
deleted file mode 100644
index 6e5383250..000000000
--- a/application/basilisk/config/mozconfigs/linux64/hazards
+++ /dev/null
@@ -1,41 +0,0 @@
-# This mozconfig is used when compiling the browser for the rooting hazard
-# analysis build (labeled H on treeherder). See
-# https://wiki.mozilla.org/Javascript:SpiderMonkey:ExactStackRooting
-
-# Do NOT include build/unix/mozconfig.linux because it points directly at the
-# tooltool-installed gcc, and the analysis works by wrapping the gcc invocation
-# with a script that invokes the real gcc with -fplugin and its configuration
-# directives. Instead, duplicate the contents of that mozconfig here:
-
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-MOZ_AUTOMATION_PACKAGE=0
-MOZ_AUTOMATION_PACKAGE_TESTS=0
-MOZ_AUTOMATION_UPLOAD=0
-
-. "$topsrcdir/build/mozconfig.common"
-ac_add_options --enable-elf-hack
-
-. "$topsrcdir/build/unix/mozconfig.stdcxx"
-
-# The objdir must be at a known location so its path can be stripped from the
-# filenames stored by the analysis
-mk_add_options MOZ_OBJDIR=obj-analyzed
-
-# The configuration options are chosen to compile the most code
-# (--enable-debug, --enable-tests) in the trickiest way possible
-# (--enable-optimize) to maximize the chance of seeing tricky static orderings.
-ac_add_options --enable-debug
-ac_add_options --enable-tests
-ac_add_options --enable-optimize
-ac_add_options --with-compiler-wrapper=$TOOLTOOL_DIR/sixgill/usr/libexec/sixgill/scripts/wrap_gcc/basecc
-ac_add_options --without-ccache
-
-CFLAGS="$CFLAGS -Wno-attributes"
-CPPFLAGS="$CPPFLAGS -Wno-attributes"
-CXXFLAGS="$CXXFLAGS -Wno-attributes"
-
-export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
-. $topsrcdir/build/unix/mozconfig.gtk
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/application/basilisk/config/mozconfigs/linux64/l10n-mozconfig b/application/basilisk/config/mozconfigs/linux64/l10n-mozconfig
deleted file mode 100644
index 4df482dc3..000000000
--- a/application/basilisk/config/mozconfigs/linux64/l10n-mozconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-no_sccache=1
-
-ac_add_options --with-l10n-base=../../l10n
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-official-branding
-
-. $topsrcdir/build/unix/mozconfig.linux
-
-export MOZILLA_OFFICIAL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-ac_add_options --disable-stdcxx-compat
-
-# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
-# Bug 1283438
-mk_add_options AUTOCLOBBER=
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/application/basilisk/config/mozconfigs/linux64/nightly b/application/basilisk/config/mozconfigs/linux64/nightly
deleted file mode 100644
index fcde93391..000000000
--- a/application/basilisk/config/mozconfigs/linux64/nightly
+++ /dev/null
@@ -1,14 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
-
-
-ac_add_options --enable-verify-mar
-
-# This will overwrite the default of stripping everything and keep the symbol table.
-# This is useful for profiling and debugging and only increases the package size
-# by 2 MBs.
-STRIP_FLAGS="--strip-debug"
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/application/basilisk/config/mozconfigs/linux64/nightly-asan b/application/basilisk/config/mozconfigs/linux64/nightly-asan
deleted file mode 100644
index 833b530d2..000000000
--- a/application/basilisk/config/mozconfigs/linux64/nightly-asan
+++ /dev/null
@@ -1,19 +0,0 @@
-# We still need to build with debug symbols
-ac_add_options --disable-debug
-ac_add_options --enable-optimize="-O2 -gline-tables-only"
-
-# ASan specific options on Linux
-ac_add_options --enable-valgrind
-
-. $topsrcdir/build/unix/mozconfig.asan
-
-export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
-. $topsrcdir/build/unix/mozconfig.gtk
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-# Need this to prevent name conflicts with the normal nightly build packages
-export MOZ_PKG_SPECIAL=asan
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/application/basilisk/config/mozconfigs/linux64/opt-static-analysis-clang b/application/basilisk/config/mozconfigs/linux64/opt-static-analysis-clang
deleted file mode 100644
index 936cc46f7..000000000
--- a/application/basilisk/config/mozconfigs/linux64/opt-static-analysis-clang
+++ /dev/null
@@ -1,22 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_PACKAGE_TESTS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/build/mozconfig.common"
-
-ac_add_options --enable-dmd
-
-# Use Clang as specified in manifest
-CC="$topsrcdir/clang/bin/clang"
-CXX="$topsrcdir/clang/bin/clang++"
-
-# Add the static checker
-ac_add_options --enable-clang-plugin
-
-. "$topsrcdir/build/unix/mozconfig.stdcxx"
-
-export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
-. $topsrcdir/build/unix/mozconfig.gtk
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/application/basilisk/config/mozconfigs/linux64/opt-tsan b/application/basilisk/config/mozconfigs/linux64/opt-tsan
deleted file mode 100644
index 12b156633..000000000
--- a/application/basilisk/config/mozconfigs/linux64/opt-tsan
+++ /dev/null
@@ -1,9 +0,0 @@
-. $topsrcdir/build/unix/mozconfig.tsan
-
-export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
-. $topsrcdir/build/unix/mozconfig.gtk
-
-# Need this to prevent name conflicts with the normal nightly build packages
-export MOZ_PKG_SPECIAL=tsan
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/application/basilisk/config/mozconfigs/linux64/release b/application/basilisk/config/mozconfigs/linux64/release
deleted file mode 100644
index 4783dfcc0..000000000
--- a/application/basilisk/config/mozconfigs/linux64/release
+++ /dev/null
@@ -1,20 +0,0 @@
-# This make file should be identical to the beta mozconfig, apart from the
-# safeguard below
-
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-mk_add_options MOZ_PGO=1
-
-# safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
-# defines.sh during the beta cycle
-export BUILDING_RELEASE=1
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/application/basilisk/config/mozconfigs/linux64/source b/application/basilisk/config/mozconfigs/linux64/source
deleted file mode 100644
index 4a3c6996b..000000000
--- a/application/basilisk/config/mozconfigs/linux64/source
+++ /dev/null
@@ -1,4 +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
diff --git a/application/basilisk/config/mozconfigs/linux64/stylo b/application/basilisk/config/mozconfigs/linux64/stylo
deleted file mode 100644
index de39747dd..000000000
--- a/application/basilisk/config/mozconfigs/linux64/stylo
+++ /dev/null
@@ -1,5 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/linux64/nightly"
-
-export LLVM_CONFIG="${TOOLTOOL_DIR}/clang/bin/llvm-config"
-
-ac_add_options --enable-stylo
diff --git a/application/basilisk/config/mozconfigs/linux64/stylo-debug b/application/basilisk/config/mozconfigs/linux64/stylo-debug
deleted file mode 100644
index 2e3614f23..000000000
--- a/application/basilisk/config/mozconfigs/linux64/stylo-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/linux64/debug"
-
-export LLVM_CONFIG="${TOOLTOOL_DIR}/clang/bin/llvm-config"
-
-ac_add_options --enable-stylo
diff --git a/application/basilisk/config/mozconfigs/linux64/valgrind b/application/basilisk/config/mozconfigs/linux64/valgrind
deleted file mode 100644
index 4aa077695..000000000
--- a/application/basilisk/config/mozconfigs/linux64/valgrind
+++ /dev/null
@@ -1,10 +0,0 @@
-. $topsrcdir/browser/config/mozconfigs/linux64/nightly
-
-ac_add_options --enable-valgrind
-ac_add_options --disable-jemalloc
-ac_add_options --disable-install-strip
-ac_add_options --disable-gtest-in-build
-
-# Include the override mozconfig again (even though the above includes it)
-# since it's supposed to override everything.
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/application/basilisk/config/mozconfigs/macosx-universal/beta b/application/basilisk/config/mozconfigs/macosx-universal/beta
deleted file mode 100644
index 894349b26..000000000
--- a/application/basilisk/config/mozconfigs/macosx-universal/beta
+++ /dev/null
@@ -1,12 +0,0 @@
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/browser/config/mozconfigs/macosx-universal/common-opt"
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/application/basilisk/config/mozconfigs/macosx-universal/common-opt b/application/basilisk/config/mozconfigs/macosx-universal/common-opt
deleted file mode 100644
index 145d32fc9..000000000
--- a/application/basilisk/config/mozconfigs/macosx-universal/common-opt
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file is sourced by the nightly, beta, and release mozconfigs.
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-# Universal builds override the default of browser (bug 575283 comment 29)
-ac_add_options --enable-application=browser
-
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-google-api-keyfile=/builds/gapi.data
-ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
diff --git a/application/basilisk/config/mozconfigs/macosx-universal/l10n-mozconfig b/application/basilisk/config/mozconfigs/macosx-universal/l10n-mozconfig
deleted file mode 100644
index 5ff95274f..000000000
--- a/application/basilisk/config/mozconfigs/macosx-universal/l10n-mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/common"
-. "$topsrcdir/build/macosx/mozconfig.common"
-
-ac_add_options --with-l10n-base=../../l10n
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-branding=browser/branding/nightly
-
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
-export MOZILLA_OFFICIAL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
-# Bug 1283438
-mk_add_options AUTOCLOBBER=
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/application/basilisk/config/mozconfigs/macosx-universal/nightly b/application/basilisk/config/mozconfigs/macosx-universal/nightly
deleted file mode 100644
index e8280983e..000000000
--- a/application/basilisk/config/mozconfigs/macosx-universal/nightly
+++ /dev/null
@@ -1,20 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/macosx-universal/common-opt"
-
-ac_add_options --disable-install-strip
-ac_add_options --enable-verify-mar
-ac_add_options --enable-profiling
-ac_add_options --enable-instruments
-
-# Cross-universal builds fail when dtrace is enabled
-if test `uname -s` != Linux; then
-  ac_add_options --enable-dtrace
-fi
-
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/application/basilisk/config/mozconfigs/macosx-universal/release b/application/basilisk/config/mozconfigs/macosx-universal/release
deleted file mode 100644
index 09da57c4f..000000000
--- a/application/basilisk/config/mozconfigs/macosx-universal/release
+++ /dev/null
@@ -1,19 +0,0 @@
-# This make file should be identical to the beta mozconfig, apart from the
-# safeguard below
-
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/browser/config/mozconfigs/macosx-universal/common-opt"
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-# safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
-# defines.sh during the beta cycle
-export BUILDING_RELEASE=1
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/application/basilisk/config/mozconfigs/macosx64/add-on-devel b/application/basilisk/config/mozconfigs/macosx64/add-on-devel
deleted file mode 100644
index e76df4dfa..000000000
--- a/application/basilisk/config/mozconfigs/macosx64/add-on-devel
+++ /dev/null
@@ -1,9 +0,0 @@
-. $topsrcdir/browser/config/mozconfigs/macosx64/nightly
-
-#add-on signing is checked but not enforced
-MOZ_REQUIRE_SIGNING=0
-ac_add_options --with-branding=browser/branding/unofficial
-ac_add_options --enable-update-channel=default
-
-# Need this to prevent name conflicts with the normal nightly build packages
-export MOZ_PKG_SPECIAL=add-on-devel
diff --git a/application/basilisk/config/mozconfigs/macosx64/artifact b/application/basilisk/config/mozconfigs/macosx64/artifact
deleted file mode 100644
index 93497630f..000000000
--- a/application/basilisk/config/mozconfigs/macosx64/artifact
+++ /dev/null
@@ -1,11 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-# Needed to set SourceRepository in application.ini (used by Talos)
-export MOZILLA_OFFICIAL=1
-
-. "$topsrcdir/build/macosx/mozconfig.common"
-. "$topsrcdir/build/mozconfig.common.override"
-
-. "$topsrcdir/build/mozconfig.artifact"
-ac_add_options --enable-artifact-build-symbols
diff --git a/application/basilisk/config/mozconfigs/macosx64/beta b/application/basilisk/config/mozconfigs/macosx64/beta
deleted file mode 100644
index 8c705405f..000000000
--- a/application/basilisk/config/mozconfigs/macosx64/beta
+++ /dev/null
@@ -1,12 +0,0 @@
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/browser/config/mozconfigs/macosx64/common-opt"
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/application/basilisk/config/mozconfigs/macosx64/common-opt b/application/basilisk/config/mozconfigs/macosx64/common-opt
deleted file mode 100644
index 413fb6dcc..000000000
--- a/application/basilisk/config/mozconfigs/macosx64/common-opt
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is sourced by the nightly, beta, and release mozconfigs.
-
-. $topsrcdir/build/macosx/mozconfig.common
-
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-google-api-keyfile=/builds/gapi.data
-ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
diff --git a/application/basilisk/config/mozconfigs/macosx64/debug b/application/basilisk/config/mozconfigs/macosx64/debug
deleted file mode 100644
index 923d020a9..000000000
--- a/application/basilisk/config/mozconfigs/macosx64/debug
+++ /dev/null
@@ -1,23 +0,0 @@
-. $topsrcdir/build/macosx/mozconfig.common
-
-ac_add_options --enable-debug
-ac_add_options --enable-dmd
-ac_add_options --enable-verify-mar
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/application/basilisk/config/mozconfigs/macosx64/debug-artifact b/application/basilisk/config/mozconfigs/macosx64/debug-artifact
deleted file mode 100644
index a625e9920..000000000
--- a/application/basilisk/config/mozconfigs/macosx64/debug-artifact
+++ /dev/null
@@ -1,10 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/build/macosx/mozconfig.common"
-. "$topsrcdir/build/mozconfig.common.override"
-
-. "$topsrcdir/build/mozconfig.artifact"
-ac_add_options --enable-artifact-build-symbols
-
-ac_add_options --enable-debug
diff --git a/application/basilisk/config/mozconfigs/macosx64/debug-asan b/application/basilisk/config/mozconfigs/macosx64/debug-asan
deleted file mode 100644
index 28d23798b..000000000
--- a/application/basilisk/config/mozconfigs/macosx64/debug-asan
+++ /dev/null
@@ -1,20 +0,0 @@
-. $topsrcdir/build/unix/mozconfig.asan
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-debug
-ac_add_options --enable-optimize="-O1"
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
-# Need this to prevent name conflicts with the normal nightly build packages
-export MOZ_PKG_SPECIAL=asan
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/application/basilisk/config/mozconfigs/macosx64/debug-static-analysis b/application/basilisk/config/mozconfigs/macosx64/debug-static-analysis
deleted file mode 100644
index bb19af612..000000000
--- a/application/basilisk/config/mozconfigs/macosx64/debug-static-analysis
+++ /dev/null
@@ -1,13 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_PACKAGE_TESTS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. $topsrcdir/build/macosx/mozconfig.common
-
-ac_add_options --enable-debug
-ac_add_options --enable-dmd
-
-ac_add_options --enable-clang-plugin
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/application/basilisk/config/mozconfigs/macosx64/l10n-mozconfig b/application/basilisk/config/mozconfigs/macosx64/l10n-mozconfig
deleted file mode 100644
index 80a06ed65..000000000
--- a/application/basilisk/config/mozconfigs/macosx64/l10n-mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/common"
-. "$topsrcdir/build/macosx/mozconfig.common"
-
-ac_add_options --with-l10n-base=../../l10n
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-official-branding
-
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
-export MOZILLA_OFFICIAL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
-# Bug 1283438
-mk_add_options AUTOCLOBBER=
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/application/basilisk/config/mozconfigs/macosx64/nightly b/application/basilisk/config/mozconfigs/macosx64/nightly
deleted file mode 100644
index c16e8e962..000000000
--- a/application/basilisk/config/mozconfigs/macosx64/nightly
+++ /dev/null
@@ -1,20 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/macosx64/common-opt"
-
-ac_add_options --disable-install-strip
-ac_add_options --enable-verify-mar
-
-ac_add_options --enable-instruments
-
-# Cross-compiled builds fail when dtrace is enabled
-if test `uname -s` != Linux; then
-  ac_add_options --enable-dtrace
-fi
-
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/application/basilisk/config/mozconfigs/macosx64/opt-static-analysis b/application/basilisk/config/mozconfigs/macosx64/opt-static-analysis
deleted file mode 100644
index 50739c01f..000000000
--- a/application/basilisk/config/mozconfigs/macosx64/opt-static-analysis
+++ /dev/null
@@ -1,15 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_PACKAGE_TESTS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. $topsrcdir/build/macosx/mozconfig.common
-
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --enable-dmd
-
-ac_add_options --enable-clang-plugin
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
-
diff --git a/application/basilisk/config/mozconfigs/macosx64/release b/application/basilisk/config/mozconfigs/macosx64/release
deleted file mode 100644
index 676bb0a7c..000000000
--- a/application/basilisk/config/mozconfigs/macosx64/release
+++ /dev/null
@@ -1,19 +0,0 @@
-# This make file should be identical to the beta mozconfig, apart from the
-# safeguard below
-
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/browser/config/mozconfigs/macosx64/common-opt"
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-# safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
-# defines.sh during the beta cycle
-export BUILDING_RELEASE=1
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/application/basilisk/config/mozconfigs/whitelist b/application/basilisk/config/mozconfigs/whitelist
deleted file mode 100644
index 01b2c943d..000000000
--- a/application/basilisk/config/mozconfigs/whitelist
+++ /dev/null
@@ -1,102 +0,0 @@
-# 'nightly' contains things that are in nightly mozconfigs and allowed to be missing from release builds.
-# Other keys in whitelist contain things are in that branches mozconfigs and allowed to be missing from nightly builds.
-whitelist = {
-    'release': {},
-    'nightly': {},
-    }
-
-all_platforms = ['win64', 'win32', 'linux32', 'linux64', 'macosx64']
-
-for platform in all_platforms:
-    whitelist['nightly'][platform] = [
-        'ac_add_options --enable-update-channel=nightly',
-        'ac_add_options --with-branding=browser/branding/nightly',
-        'ac_add_options --enable-profiling',
-        'mk_add_options CLIENT_PY_ARGS="--hg-options=\'--verbose --time\' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --tinderbox-print"'
-    ]
-
-for platform in ['linux32', 'linux64', 'macosx64']:
-    whitelist['nightly'][platform] += [
-        'mk_add_options MOZ_MAKE_FLAGS="-j4"',
-    ]
-
-whitelist['nightly']['linux32'] += [
-    'CXX=$REAL_CXX',
-    'CXX="ccache $REAL_CXX"',
-    'CC="ccache $REAL_CC"',
-    'mk_add_options PROFILE_GEN_SCRIPT=@TOPSRCDIR@/build/profile_pageloader.pl',
-    'ac_add_options --with-ccache=/usr/bin/ccache',
-    '. "$topsrcdir/build/mozconfig.cache"',
-    'export MOZILLA_OFFICIAL=1',
-    'export MOZ_TELEMETRY_REPORTING=1',
-    "mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'",
-    'STRIP_FLAGS="--strip-debug"',
-]
-
-whitelist['nightly']['linux64'] += [
-    'export MOZILLA_OFFICIAL=1',
-    'export MOZ_TELEMETRY_REPORTING=1',
-    "mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'",
-    'STRIP_FLAGS="--strip-debug"',
-    'ac_add_options --with-ccache=/usr/bin/ccache',
-    '. "$topsrcdir/build/mozconfig.cache"',
-]
-
-whitelist['nightly']['macosx64'] += [
-    'if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then',
-    'ac_add_options --with-macbundlename-prefix=Firefox',
-    'fi',
-    'mk_add_options MOZ_MAKE_FLAGS="-j12"',
-    'ac_add_options --with-ccache',
-    '. "$topsrcdir/build/mozconfig.cache"',
-    'ac_add_options --disable-install-strip',
-    'ac_add_options --enable-instruments',
-    'ac_add_options --enable-dtrace',
-    'if test `uname -s` != Linux; then',
-]
-
-whitelist['nightly']['win32'] += [
-    '. $topsrcdir/configs/mozilla2/win32/include/choose-make-flags',
-    'mk_add_options MOZ_MAKE_FLAGS=-j1',
-    '. "$topsrcdir/build/mozconfig.cache"',
-    'if test "$IS_NIGHTLY" != ""; then',
-    'ac_add_options --disable-auto-deps',
-    'fi',
-]
-whitelist['nightly']['win64'] += [
-    '. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"',
-    '. "$topsrcdir/build/mozconfig.cache"',
-]
-
-for platform in all_platforms:
-    whitelist['release'][platform] = [
-        'ac_add_options --enable-update-channel=release',
-        'ac_add_options --enable-official-branding',
-        'mk_add_options MOZ_MAKE_FLAGS="-j4"',
-        'export BUILDING_RELEASE=1',
-        'if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then',
-        'MOZ_AUTOMATION_UPLOAD_SYMBOLS=1',
-        'MOZ_AUTOMATION_UPDATE_PACKAGING=1',
-        'fi',
-    ]
-whitelist['release']['win32'] += ['mk_add_options MOZ_PGO=1']
-whitelist['release']['win64'] += ['mk_add_options MOZ_PGO=1']
-
-whitelist['release']['linux32'] += [
-    'export MOZILLA_OFFICIAL=1',
-    'export MOZ_TELEMETRY_REPORTING=1',
-    'mk_add_options MOZ_PGO=1',
-    "mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'",
-    'MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}',
-]
-whitelist['release']['linux64'] += [
-    'export MOZILLA_OFFICIAL=1',
-    'export MOZ_TELEMETRY_REPORTING=1',
-    'mk_add_options MOZ_PGO=1',
-    "mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'",
-    'MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}',
-]
-
-if __name__ == '__main__':
-    import pprint
-    pprint.pprint(whitelist)
diff --git a/application/basilisk/config/mozconfigs/win32/add-on-devel b/application/basilisk/config/mozconfigs/win32/add-on-devel
deleted file mode 100644
index d84c1f5e4..000000000
--- a/application/basilisk/config/mozconfigs/win32/add-on-devel
+++ /dev/null
@@ -1,9 +0,0 @@
-. $topsrcdir/browser/config/mozconfigs/win32/nightly
-
-#add-on signing is checked but not enforced
-MOZ_REQUIRE_SIGNING=0
-ac_add_options --with-branding=browser/branding/unofficial
-ac_add_options --enable-update-channel=default
-
-# Need this to prevent name conflicts with the normal nightly build packages
-export MOZ_PKG_SPECIAL=add-on-devel
diff --git a/application/basilisk/config/mozconfigs/win32/artifact b/application/basilisk/config/mozconfigs/win32/artifact
deleted file mode 100644
index d18bedd6e..000000000
--- a/application/basilisk/config/mozconfigs/win32/artifact
+++ /dev/null
@@ -1,13 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-# Needed to set SourceRepository in application.ini (used by Talos)
-export MOZILLA_OFFICIAL=1
-
-. "$topsrcdir/browser/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/build/win32/mozconfig.vs-latest"
-. "$topsrcdir/build/mozconfig.common.override"
-
-. "$topsrcdir/build/mozconfig.artifact"
-ac_add_options --enable-artifact-build-symbols
diff --git a/application/basilisk/config/mozconfigs/win32/beta b/application/basilisk/config/mozconfigs/win32/beta
deleted file mode 100644
index 52f683e5b..000000000
--- a/application/basilisk/config/mozconfigs/win32/beta
+++ /dev/null
@@ -1,14 +0,0 @@
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/browser/config/mozconfigs/win32/common-opt"
-
-mk_add_options MOZ_PGO=1
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/application/basilisk/config/mozconfigs/win32/clang b/application/basilisk/config/mozconfigs/win32/clang
deleted file mode 100644
index 119a26ed3..000000000
--- a/application/basilisk/config/mozconfigs/win32/clang
+++ /dev/null
@@ -1,16 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_PACKAGE_TESTS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/browser/config/mozconfigs/common"
-
-ac_add_options --enable-optimize
-
-ac_add_options --enable-clang-plugin
-
-. $topsrcdir/build/win32/mozconfig.vs-latest
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
-. "$topsrcdir/build/mozconfig.clang-cl"
diff --git a/application/basilisk/config/mozconfigs/win32/clang-debug b/application/basilisk/config/mozconfigs/win32/clang-debug
deleted file mode 100644
index 372e54583..000000000
--- a/application/basilisk/config/mozconfigs/win32/clang-debug
+++ /dev/null
@@ -1,17 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_PACKAGE_TESTS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/browser/config/mozconfigs/common"
-
-ac_add_options --enable-optimize
-ac_add_options --enable-debug
-
-ac_add_options --enable-clang-plugin
-
-. $topsrcdir/build/win32/mozconfig.vs-latest
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
-. "$topsrcdir/build/mozconfig.clang-cl"
diff --git a/application/basilisk/config/mozconfigs/win32/common-opt b/application/basilisk/config/mozconfigs/win32/common-opt
deleted file mode 100644
index 816c8926a..000000000
--- a/application/basilisk/config/mozconfigs/win32/common-opt
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file is sourced by the nightly, beta, and release mozconfigs.
-
-. "$topsrcdir/browser/config/mozconfigs/common"
-
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-jemalloc
-
-if [ -f /c/builds/gapi.data ]; then
-  _gapi_keyfile=c:/builds/gapi.data
-else
-  _gapi_keyfile=e:/builds/gapi.data
-fi
-ac_add_options --with-google-api-keyfile=${_gapi_keyfile}
-
-ac_add_options --with-mozilla-api-keyfile=c:/builds/mozilla-desktop-geoloc-api.key
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-. $topsrcdir/build/win32/mozconfig.vs-latest
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
diff --git a/application/basilisk/config/mozconfigs/win32/debug b/application/basilisk/config/mozconfigs/win32/debug
deleted file mode 100644
index 6b629103f..000000000
--- a/application/basilisk/config/mozconfigs/win32/debug
+++ /dev/null
@@ -1,24 +0,0 @@
-. "$topsrcdir/build/mozconfig.win-common"
-MOZ_AUTOMATION_L10N_CHECK=0
-. "$topsrcdir/browser/config/mozconfigs/common"
-
-ac_add_options --enable-debug
-ac_add_options --enable-dmd
-ac_add_options --enable-profiling  # needed for --enable-dmd to work on Windows
-ac_add_options --enable-verify-mar
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-. $topsrcdir/build/win32/mozconfig.vs-latest
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/application/basilisk/config/mozconfigs/win32/debug-artifact b/application/basilisk/config/mozconfigs/win32/debug-artifact
deleted file mode 100644
index 1d7ab24ba..000000000
--- a/application/basilisk/config/mozconfigs/win32/debug-artifact
+++ /dev/null
@@ -1,12 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/browser/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/build/win32/mozconfig.vs-latest"
-. "$topsrcdir/build/mozconfig.common.override"
-
-. "$topsrcdir/build/mozconfig.artifact"
-ac_add_options --enable-artifact-build-symbols
-
-ac_add_options --enable-debug
diff --git a/application/basilisk/config/mozconfigs/win32/debug-static-analysis b/application/basilisk/config/mozconfigs/win32/debug-static-analysis
deleted file mode 100644
index 29bfb2fdd..000000000
--- a/application/basilisk/config/mozconfigs/win32/debug-static-analysis
+++ /dev/null
@@ -1,17 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_PACKAGE_TESTS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/browser/config/mozconfigs/common"
-
-ac_add_options --enable-debug
-ac_add_options --enable-dmd
-
-ac_add_options --enable-clang-plugin
-
-. $topsrcdir/build/win32/mozconfig.vs-latest
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
-. "$topsrcdir/build/mozconfig.clang-cl"
diff --git a/application/basilisk/config/mozconfigs/win32/l10n-mozconfig b/application/basilisk/config/mozconfigs/win32/l10n-mozconfig
deleted file mode 100644
index d05067e03..000000000
--- a/application/basilisk/config/mozconfigs/win32/l10n-mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/common"
-
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-l10n-base=../../l10n
-ac_add_options --with-windows-version=603
-ac_add_options --enable-official-branding
-
-export MOZILLA_OFFICIAL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
-# Bug 1283438
-mk_add_options AUTOCLOBBER=
-
-. $topsrcdir/build/win32/mozconfig.vs-latest
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/application/basilisk/config/mozconfigs/win32/nightly b/application/basilisk/config/mozconfigs/win32/nightly
deleted file mode 100644
index 250997a8f..000000000
--- a/application/basilisk/config/mozconfigs/win32/nightly
+++ /dev/null
@@ -1,10 +0,0 @@
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/browser/config/mozconfigs/win32/common-opt"
-
-
-ac_add_options --enable-verify-mar
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/application/basilisk/config/mozconfigs/win32/release b/application/basilisk/config/mozconfigs/win32/release
deleted file mode 100644
index 3d0750162..000000000
--- a/application/basilisk/config/mozconfigs/win32/release
+++ /dev/null
@@ -1,21 +0,0 @@
-# This make file should be identical to the beta mozconfig, apart from the
-# safeguard below
-
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/browser/config/mozconfigs/win32/common-opt"
-
-mk_add_options MOZ_PGO=1
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-# safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
-# defines.sh during the beta cycle
-export BUILDING_RELEASE=1
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/application/basilisk/config/mozconfigs/win64/add-on-devel b/application/basilisk/config/mozconfigs/win64/add-on-devel
deleted file mode 100644
index 47d0bf589..000000000
--- a/application/basilisk/config/mozconfigs/win64/add-on-devel
+++ /dev/null
@@ -1,9 +0,0 @@
-. $topsrcdir/browser/config/mozconfigs/win64/nightly
-
-#add-on signing is checked but not enforced
-MOZ_REQUIRE_SIGNING=0
-ac_add_options --with-branding=browser/branding/unofficial
-ac_add_options --enable-update-channel=default
-
-#Need this to prevent name conflicts with the normal nightly build packages
-export MOZ_PKG_SPECIAL=add-on-devel
diff --git a/application/basilisk/config/mozconfigs/win64/artifact b/application/basilisk/config/mozconfigs/win64/artifact
deleted file mode 100644
index 993424844..000000000
--- a/application/basilisk/config/mozconfigs/win64/artifact
+++ /dev/null
@@ -1,14 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-# Needed to set SourceRepository in application.ini (used by Talos)
-export MOZILLA_OFFICIAL=1
-
-. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
-. "$topsrcdir/browser/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/build/win64/mozconfig.vs-latest"
-. "$topsrcdir/build/mozconfig.common.override"
-
-. "$topsrcdir/build/mozconfig.artifact"
-ac_add_options --enable-artifact-build-symbols
diff --git a/application/basilisk/config/mozconfigs/win64/beta b/application/basilisk/config/mozconfigs/win64/beta
deleted file mode 100644
index 4a6fe7ebe..000000000
--- a/application/basilisk/config/mozconfigs/win64/beta
+++ /dev/null
@@ -1,15 +0,0 @@
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
-. "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
-
-mk_add_options MOZ_PGO=1
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/application/basilisk/config/mozconfigs/win64/clang b/application/basilisk/config/mozconfigs/win64/clang
deleted file mode 100644
index 14f09b97a..000000000
--- a/application/basilisk/config/mozconfigs/win64/clang
+++ /dev/null
@@ -1,18 +0,0 @@
-MOZ_AUTOMATION_L10N_CHECK=0
-MOZ_AUTOMATION_PACKAGE_TEST=0
-
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/browser/config/mozconfigs/common"
-
-ac_add_options --target=x86_64-pc-mingw32
-ac_add_options --host=x86_64-pc-mingw32
-
-ac_add_options --enable-optimize
-
-ac_add_options --enable-clang-plugin
-
-. $topsrcdir/build/win64/mozconfig.vs-latest
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
-. "$topsrcdir/build/mozconfig.clang-cl"
diff --git a/application/basilisk/config/mozconfigs/win64/clang-debug b/application/basilisk/config/mozconfigs/win64/clang-debug
deleted file mode 100644
index 5565578fb..000000000
--- a/application/basilisk/config/mozconfigs/win64/clang-debug
+++ /dev/null
@@ -1,19 +0,0 @@
-MOZ_AUTOMATION_L10N_CHECK=0
-MOZ_AUTOMATION_PACKAGE_TEST=0
-
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/browser/config/mozconfigs/common"
-
-ac_add_options --target=x86_64-pc-mingw32
-ac_add_options --host=x86_64-pc-mingw32
-
-ac_add_options --enable-optimize
-ac_add_options --enable-debug
-
-ac_add_options --enable-clang-plugin
-
-. $topsrcdir/build/win64/mozconfig.vs-latest
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
-. "$topsrcdir/build/mozconfig.clang-cl"
diff --git a/application/basilisk/config/mozconfigs/win64/common-opt b/application/basilisk/config/mozconfigs/win64/common-opt
deleted file mode 100644
index 40fba7f76..000000000
--- a/application/basilisk/config/mozconfigs/win64/common-opt
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file is sourced by the nightly, beta, and release mozconfigs.
-
-. "$topsrcdir/browser/config/mozconfigs/common"
-
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-jemalloc
-if [ -f /c/builds/gapi.data ]; then
-  _gapi_keyfile=c:/builds/gapi.data
-else
-  _gapi_keyfile=e:/builds/gapi.data
-fi
-ac_add_options --with-google-api-keyfile=${_gapi_keyfile}
-
-ac_add_options --with-mozilla-api-keyfile=c:/builds/mozilla-desktop-geoloc-api.key
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-. $topsrcdir/build/win64/mozconfig.vs-latest
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
diff --git a/application/basilisk/config/mozconfigs/win64/common-win64 b/application/basilisk/config/mozconfigs/win64/common-win64
deleted file mode 100644
index 8f167cad1..000000000
--- a/application/basilisk/config/mozconfigs/win64/common-win64
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is used by all Win64 builds
-
-ac_add_options --target=x86_64-pc-mingw32
-ac_add_options --host=x86_64-pc-mingw32
-
diff --git a/application/basilisk/config/mozconfigs/win64/debug b/application/basilisk/config/mozconfigs/win64/debug
deleted file mode 100644
index 723fa0e0b..000000000
--- a/application/basilisk/config/mozconfigs/win64/debug
+++ /dev/null
@@ -1,27 +0,0 @@
-. "$topsrcdir/build/mozconfig.win-common"
-MOZ_AUTOMATION_L10N_CHECK=0
-. "$topsrcdir/browser/config/mozconfigs/common"
-
-ac_add_options --target=x86_64-pc-mingw32
-ac_add_options --host=x86_64-pc-mingw32
-
-ac_add_options --enable-debug
-ac_add_options --enable-dmd
-ac_add_options --enable-profiling  # needed for --enable-dmd to work on Windows
-ac_add_options --enable-verify-mar
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. $topsrcdir/build/win64/mozconfig.vs-latest
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/application/basilisk/config/mozconfigs/win64/debug-artifact b/application/basilisk/config/mozconfigs/win64/debug-artifact
deleted file mode 100644
index bb9dc9fa8..000000000
--- a/application/basilisk/config/mozconfigs/win64/debug-artifact
+++ /dev/null
@@ -1,13 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
-. "$topsrcdir/browser/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/build/win64/mozconfig.vs-latest"
-. "$topsrcdir/build/mozconfig.common.override"
-
-. "$topsrcdir/build/mozconfig.artifact"
-ac_add_options --enable-artifact-build-symbols
-
-ac_add_options --enable-debug
diff --git a/application/basilisk/config/mozconfigs/win64/l10n-mozconfig b/application/basilisk/config/mozconfigs/win64/l10n-mozconfig
deleted file mode 100644
index 3b9b4af1c..000000000
--- a/application/basilisk/config/mozconfigs/win64/l10n-mozconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/common"
-. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
-
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-l10n-base=../../l10n
-ac_add_options --with-windows-version=603
-ac_add_options --enable-official-branding
-
-export MOZILLA_OFFICIAL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
-# Bug 1283438
-mk_add_options AUTOCLOBBER=
-
-. $topsrcdir/build/win64/mozconfig.vs-latest
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/application/basilisk/config/mozconfigs/win64/nightly b/application/basilisk/config/mozconfigs/win64/nightly
deleted file mode 100644
index 395b5580d..000000000
--- a/application/basilisk/config/mozconfigs/win64/nightly
+++ /dev/null
@@ -1,11 +0,0 @@
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
-. "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
-
-
-ac_add_options --enable-verify-mar
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/application/basilisk/config/mozconfigs/win64/release b/application/basilisk/config/mozconfigs/win64/release
deleted file mode 100644
index 9b38cf00d..000000000
--- a/application/basilisk/config/mozconfigs/win64/release
+++ /dev/null
@@ -1,22 +0,0 @@
-# This make file should be identical to the beta mozconfig, apart from the
-# safeguard below
-
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
-. "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
-
-mk_add_options MOZ_PGO=1
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-# safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
-# defines.sh during the beta cycle
-export BUILDING_RELEASE=1
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/application/basilisk/config/tooltool-manifests/linux32/clang.manifest b/application/basilisk/config/tooltool-manifests/linux32/clang.manifest
deleted file mode 100644
index b1896c898..000000000
--- a/application/basilisk/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/application/basilisk/config/tooltool-manifests/linux32/releng.manifest b/application/basilisk/config/tooltool-manifests/linux32/releng.manifest
deleted file mode 100644
index d1c19789f..000000000
--- a/application/basilisk/config/tooltool-manifests/linux32/releng.manifest
+++ /dev/null
@@ -1,35 +0,0 @@
-[
-{
-"version": "gcc 4.9.4 + PR64905",
-"size": 101297752,
-"digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
-"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.14.0 (e8a012324 2016-12-16) repack",
-"size": 132388656,
-"digest": "46c2c5d048b6d9e9bbb163277a1ae8a3c37727ad8aa8dd661c2b95e2b68e4e85b20ae4fa0eadf3a37a3c09801964fd7107151909ad07c3a7b2fbf805c7035d97",
-"algorithm": "sha512",
-"filename": "rustc.tar.xz",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.xz",
-"unpack": true,
-"digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
-"size": 1020700
-}
-]
diff --git a/application/basilisk/config/tooltool-manifests/linux64/asan.manifest b/application/basilisk/config/tooltool-manifests/linux64/asan.manifest
deleted file mode 100644
index 3f6b66266..000000000
--- a/application/basilisk/config/tooltool-manifests/linux64/asan.manifest
+++ /dev/null
@@ -1,34 +0,0 @@
-[
-{
-"version": "gcc 4.9.4 + PR64905",
-"size": 101297752,
-"digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
-"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
-},
-{
-"version": "rustc 1.14.0 (e8a012324 2016-12-16) repack",
-"size": 132388656,
-"digest": "46c2c5d048b6d9e9bbb163277a1ae8a3c37727ad8aa8dd661c2b95e2b68e4e85b20ae4fa0eadf3a37a3c09801964fd7107151909ad07c3a7b2fbf805c7035d97",
-"algorithm": "sha512",
-"filename": "rustc.tar.xz",
-"unpack": true
-},
-{
-"size": 12072532,
-"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
-"algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"setup": "setup.sh",
-"unpack": true
-}
-]
diff --git a/application/basilisk/config/tooltool-manifests/linux64/clang.manifest b/application/basilisk/config/tooltool-manifests/linux64/clang.manifest
deleted file mode 100644
index 55ce4a417..000000000
--- a/application/basilisk/config/tooltool-manifests/linux64/clang.manifest
+++ /dev/null
@@ -1,35 +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
-},
-{
-"version": "rustc 1.14.0 (e8a012324 2016-12-16) repack",
-"size": 132388656,
-"digest": "46c2c5d048b6d9e9bbb163277a1ae8a3c37727ad8aa8dd661c2b95e2b68e4e85b20ae4fa0eadf3a37a3c09801964fd7107151909ad07c3a7b2fbf805c7035d97",
-"algorithm": "sha512",
-"filename": "rustc.tar.xz",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.xz",
-"unpack": true,
-"digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
-"size": 1020700
-}
-]
diff --git a/application/basilisk/config/tooltool-manifests/linux64/clang.manifest.centos6 b/application/basilisk/config/tooltool-manifests/linux64/clang.manifest.centos6
deleted file mode 100644
index e7df3632a..000000000
--- a/application/basilisk/config/tooltool-manifests/linux64/clang.manifest.centos6
+++ /dev/null
@@ -1,34 +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
-},
-{
-"version": "rustc 1.14.0 (e8a012324 2016-12-16) repack",
-"size": 132388656,
-"digest": "46c2c5d048b6d9e9bbb163277a1ae8a3c37727ad8aa8dd661c2b95e2b68e4e85b20ae4fa0eadf3a37a3c09801964fd7107151909ad07c3a7b2fbf805c7035d97",
-"algorithm": "sha512",
-"filename": "rustc.tar.xz",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"filename": "sccache2.tar.xz",
-"unpack": true,
-"digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
-"size": 1020700
-}
-]
diff --git a/application/basilisk/config/tooltool-manifests/linux64/hazard.manifest b/application/basilisk/config/tooltool-manifests/linux64/hazard.manifest
deleted file mode 100644
index 678c78cc6..000000000
--- a/application/basilisk/config/tooltool-manifests/linux64/hazard.manifest
+++ /dev/null
@@ -1,43 +0,0 @@
-[
-{
-"version": "gcc 4.9.4 + PR64905",
-"size": 101297752,
-"digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
-"algorithm": "sha512",
-"filename": "gcc.tar.xz",
-"unpack": true
-},
-{
-"digest": "36dc644e24c0aa824975ad8f5c15714445d5cb064d823000c3cb637e885199414d7df551e6b99233f0656dcf5760918192ef04113c486af37f3c489bb93ad029",
-"unpack": true,
-"algorithm": "sha512",
-"filename": "sixgill.tar.xz",
-"size": 2631908,
-"hg_id": "8cb9c3fb039a+ tip"
-},
-{
-"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
-"unpack": true,
-"setup": "setup.sh",
-"algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"size": 12072532
-},
-{
-"version": "rustc 1.14.0 (e8a012324 2016-12-16) repack",
-"size": 132388656,
-"digest": "46c2c5d048b6d9e9bbb163277a1ae8a3c37727ad8aa8dd661c2b95e2b68e4e85b20ae4fa0eadf3a37a3c09801964fd7107151909ad07c3a7b2fbf805c7035d97",
-"algorithm": "sha512",
-"filename": "rustc.tar.xz",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.xz",
-"unpack": true,
-"digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
-"size": 1020700
-}
-]
diff --git a/application/basilisk/config/tooltool-manifests/linux64/msan.manifest b/application/basilisk/config/tooltool-manifests/linux64/msan.manifest
deleted file mode 100644
index 3f6b66266..000000000
--- a/application/basilisk/config/tooltool-manifests/linux64/msan.manifest
+++ /dev/null
@@ -1,34 +0,0 @@
-[
-{
-"version": "gcc 4.9.4 + PR64905",
-"size": 101297752,
-"digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
-"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
-},
-{
-"version": "rustc 1.14.0 (e8a012324 2016-12-16) repack",
-"size": 132388656,
-"digest": "46c2c5d048b6d9e9bbb163277a1ae8a3c37727ad8aa8dd661c2b95e2b68e4e85b20ae4fa0eadf3a37a3c09801964fd7107151909ad07c3a7b2fbf805c7035d97",
-"algorithm": "sha512",
-"filename": "rustc.tar.xz",
-"unpack": true
-},
-{
-"size": 12072532,
-"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
-"algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"setup": "setup.sh",
-"unpack": true
-}
-]
diff --git a/application/basilisk/config/tooltool-manifests/linux64/releng.manifest b/application/basilisk/config/tooltool-manifests/linux64/releng.manifest
deleted file mode 100644
index 76fda3f6e..000000000
--- a/application/basilisk/config/tooltool-manifests/linux64/releng.manifest
+++ /dev/null
@@ -1,43 +0,0 @@
-[
-{
-"version": "gcc 4.9.4 + PR64905",
-"size": 101297752,
-"digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
-"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.14.0 (e8a012324 2016-12-16) repack",
-"size": 132388656,
-"digest": "46c2c5d048b6d9e9bbb163277a1ae8a3c37727ad8aa8dd661c2b95e2b68e4e85b20ae4fa0eadf3a37a3c09801964fd7107151909ad07c3a7b2fbf805c7035d97",
-"algorithm": "sha512",
-"filename": "rustc.tar.xz",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.xz",
-"unpack": true,
-"digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
-"size": 1020700
-},
-{
-"version": "clang + llvm 3.9.0, built from SVN r290136",
-"size": 151724092,
-"digest": "4ab5ff2131e4ce4888d38c17feb192c19bc6ede83abef55af7d2f29e2446f6335dc860377fa25cbb0283b3958c0a3d377a3cfdc7705a85d4843e3ab357ddca7f",
-"algorithm": "sha512",
-"filename": "clang.tar.xz",
-"unpack": true
-}
-]
diff --git a/application/basilisk/config/tooltool-manifests/linux64/tsan.manifest b/application/basilisk/config/tooltool-manifests/linux64/tsan.manifest
deleted file mode 100644
index 8e7017090..000000000
--- a/application/basilisk/config/tooltool-manifests/linux64/tsan.manifest
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-{
-"version": "gcc 4.9.4 + PR64905",
-"size": 101297752,
-"digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
-"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/application/basilisk/config/tooltool-manifests/macosx64/asan.manifest b/application/basilisk/config/tooltool-manifests/macosx64/asan.manifest
deleted file mode 100644
index 1a10ee164..000000000
--- a/application/basilisk/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/application/basilisk/config/tooltool-manifests/macosx64/clang.manifest b/application/basilisk/config/tooltool-manifests/macosx64/clang.manifest
deleted file mode 100644
index a7757de14..000000000
--- a/application/basilisk/config/tooltool-manifests/macosx64/clang.manifest
+++ /dev/null
@@ -1,35 +0,0 @@
-[
-{
-"version": "clang 3.8.0",
-"size": 133060926,
-"digest": "aff5ad3ac2d41db19d1ba0df5f97b189a7d7e1b6af8c56e22c2b0cced84d75fa98394ded6a4ba5713652e6684a0a46f47aeccf87991f9e849bf8d7d82e564f6f",
-"algorithm": "sha512",
-"filename": "clang.tar.bz2",
-"unpack": true
-},
-{
-"version": "rustc 1.14.0 (e8a012324 2016-12-16) repack",
-"size": 118864812,
-"digest": "649900813154b21c51c129050fde791e9974083936c9ef002dc18e1c6f8b9ad9ecfbdb5dd580e87743fc2bebed9b64ef9906461e60ec2a1e5277f3c213f417c9",
-"algorithm": "sha512",
-"filename": "rustc.tar.bz2",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.bz2",
-"unpack": true,
-"digest": "a285c7c6468ad7438262dfec90f65981e84abf2adbb1aa075c0ec1759b4f98ce5d5f14a3d555274f970704210a00738ba7d95db2fc320f7780e6b99bcb0ffb6c",
-"size": 1143715
-},
-{
-"version": "cctools port from commit hash db1f8d906cb28, ld only",
-"size": 634496,
-"digest": "037f31fcf29e7bb7fada0d2bdd5e95c7d4cb2692f2a5c98ed6f6a7561b9d81622d015f0d12b291d3667719655f1369e8ce8a0a4a4773aa0ee4753e04a8821173",
-"algorithm": "sha512",
-"filename": "cctools.tar.bz2",
-"unpack": true
-}
-]
diff --git a/application/basilisk/config/tooltool-manifests/macosx64/cross-clang.manifest b/application/basilisk/config/tooltool-manifests/macosx64/cross-clang.manifest
deleted file mode 100644
index 7193da298..000000000
--- a/application/basilisk/config/tooltool-manifests/macosx64/cross-clang.manifest
+++ /dev/null
@@ -1,43 +0,0 @@
-[
-{
-"version": "clang 3.8.0, libgcc 4.9.4 + PR64905",
-"size": 155933720,
-"digest": "7a3a9a5ff455554d120596fe4bc06c19e41ecbd1e67b1e95e778c0b8ce6d9472f30fd4a27c66d48d9c047aac7a077f23f87397711dd6f33175f95cf4a2ada862",
-"algorithm": "sha512",
-"filename": "clang.tar.xz",
-"unpack": true
-},
-{
-"version": "gcc 4.9.4 + PR64905",
-"size": 101297752,
-"digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
-"algorithm": "sha512",
-"filename": "gcc.tar.xz",
-"unpack": true
-},
-{
-"size": 3008804,
-"visibility": "public",
-"digest": "ba6937f14f3d8b26dcb2d39490dee6b0a8afb60f672f5debb71d7b62c1ec52103201b4b1a3d258f945567de531384b36ddb2ce4aa73dc63d72305b11c146847c",
-"algorithm": "sha512",
-"unpack": true,
-"filename": "cctools.tar.gz"
-},
-{
-"size": 30823112,
-"visibility": "internal",
-"digest": "0c58e06a3ea8f4641c991a7406fc8733c574f0b4aa773bce0feaa5468d2b8440fa33cea056e16fad2b8a7ef4409ca7228113eb12adc87c3e115129d8a3b3b565",
-"algorithm": "sha512",
-"unpack": true,
-"filename": "MacOSX10.10.sdk.tar.xz"
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.xz",
-"unpack": true,
-"digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
-"size": 1020700
-}
-]
diff --git a/application/basilisk/config/tooltool-manifests/macosx64/cross-releng.manifest b/application/basilisk/config/tooltool-manifests/macosx64/cross-releng.manifest
deleted file mode 100644
index 99ee67acd..000000000
--- a/application/basilisk/config/tooltool-manifests/macosx64/cross-releng.manifest
+++ /dev/null
@@ -1,59 +0,0 @@
-[
-{
-"version": "clang 3.8.0, libgcc 4.8.5",
-"size": 140319580,
-"digest": "34e219d7e8eaffa81710631c34d21355563d06335b3c00851e94c1f42f9098788fded8463dd0f67dd699f77b47a0245dd7aff754943a7a03fb5fd145a808254f",
-"algorithm": "sha512",
-"filename": "clang.tar.xz",
-"unpack": true
-},
-{
-"size": 3008804,
-"visibility": "public",
-"digest": "ba6937f14f3d8b26dcb2d39490dee6b0a8afb60f672f5debb71d7b62c1ec52103201b4b1a3d258f945567de531384b36ddb2ce4aa73dc63d72305b11c146847c",
-"algorithm": "sha512",
-"unpack": true,
-"filename": "cctools.tar.gz"
-},
-{
-"size": 35215976,
-"visibility": "internal",
-"digest": "8be736545ddab25ebded188458ce974d5c9a7e29f3c50d2ebfbcb878f6aff853dd2ff5a3528bdefc64396a10101a1b50fd2fe52000140df33643cebe1ea759da",
-"algorithm": "sha512",
-"unpack": true,
-"filename": "MacOSX10.7.sdk.tar.bz2"
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.xz",
-"unpack": true,
-"digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
-"size": 1020700
-},
-{
-"size": 57060,
-"visibility": "public",
-"digest": "9649ca595f4cf088d118da26201f92cc94cda7af49c7c48112ee31cd13c83b2935b3e145de9dd78060cff2480b4c2e7ff5fb24235876956fed13c87852071998",
-"algorithm": "sha512",
-"unpack": true,
-"filename": "dmg.tar.xz"
-},
-{
-"size": 188880,
-"visibility": "public",
-"digest": "1ffddd43efb03aed897ee42035d9d8d758a8d66ab6c867599ef755e1a586768fc22011ce03698af61454920b00fe8bed08c9a681e7bd324d7f8f78c026c83943",
-"algorithm": "sha512",
-"unpack": true,
-"filename": "genisoimage.tar.xz"
-},
-{
-"version": "rustc 1.14.0 (e8a012324 2016-12-16) repack",
-"size": 152573516,
-"digest": "eef2f10bf57005d11c34b9b49eb76d0f09d026295055039fea89952a3be51580abdab29366278ed4bfa393b33c5cee4d51d3af4221e9e7d7d833d0fc1347597c",
-"algorithm": "sha512",
-"filename": "rustc.tar.xz",
-"unpack": true
-}
-]
diff --git a/application/basilisk/config/tooltool-manifests/macosx64/releng.manifest b/application/basilisk/config/tooltool-manifests/macosx64/releng.manifest
deleted file mode 100644
index 00d1cb602..000000000
--- a/application/basilisk/config/tooltool-manifests/macosx64/releng.manifest
+++ /dev/null
@@ -1,35 +0,0 @@
-[
-{
-"version": "clang 3.8.0",
-"size": 133060926,
-"digest": "aff5ad3ac2d41db19d1ba0df5f97b189a7d7e1b6af8c56e22c2b0cced84d75fa98394ded6a4ba5713652e6684a0a46f47aeccf87991f9e849bf8d7d82e564f6f",
-"algorithm": "sha512",
-"filename": "clang.tar.bz2",
-"unpack": true
-},
-{
-"version": "rustc 1.14.0 (e8a012324 2016-12-16) repack",
-"size": 118864812,
-"digest": "649900813154b21c51c129050fde791e9974083936c9ef002dc18e1c6f8b9ad9ecfbdb5dd580e87743fc2bebed9b64ef9906461e60ec2a1e5277f3c213f417c9",
-"algorithm": "sha512",
-"filename": "rustc.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
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.bz2",
-"unpack": true,
-"digest": "a285c7c6468ad7438262dfec90f65981e84abf2adbb1aa075c0ec1759b4f98ce5d5f14a3d555274f970704210a00738ba7d95db2fc320f7780e6b99bcb0ffb6c",
-"size": 1143715
-}
-]
diff --git a/application/basilisk/config/tooltool-manifests/win32/build-clang-cl.manifest b/application/basilisk/config/tooltool-manifests/win32/build-clang-cl.manifest
deleted file mode 100644
index b5e067b8f..000000000
--- a/application/basilisk/config/tooltool-manifests/win32/build-clang-cl.manifest
+++ /dev/null
@@ -1,57 +0,0 @@
-[
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-},
-{
-"version": "rustc 1.14.0 (e8a012324 2016-12-16) repack",
-"size": 63983591,
-"digest": "7bd57c81e57a984a83de75dce214e344cee870bf7e1955ae3831f5a3d638fd4d2d1dca6d434a3264f98bc3b3f00dedb55d0b6d28afd9015d231e8a8f3075dea0",
-"algorithm": "sha512",
-"filename": "rustc.tar.bz2",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.bz2",
-"unpack": true,
-"digest": "7dee5c5602b3830cb8ac45ebaa8542714bbac0e50eabbff58a06972a02ceeab75ed7c56ff22a23f760b8317ae8e9a01cdecfaf75a7acbd2a4cdd817967170d2e",
-"size": 1179901
-},
-{
-"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
-},
-{
-"version": "SVN 1.9.4, repacked from SlikSvn (https://sliksvn.com/download/)",
-"size": 3934520,
-"digest": "d3b8f74936857ecbf542e403ed6835938a31d65302985729cbfa7191bf2cf94138565cefcc2f31517098013fbfc51868348863a55b588250902f9dec214dbc42",
-"algorithm": "sha512",
-"filename": "svn194.zip",
-"unpack": true
-},
-{
-"version": "CMake 3.6.2 repack",
-"size": 19832889,
-"digest": "39b0508b60f655969d1b54c76753b14b5b2e92dab58613c835aed798a6aeb9077a7df78aebc011c2c753661fdc15007d3353c0c8773a53148380e2ec02afb629",
-"algorithm": "sha512",
-"filename": "cmake362.zip",
-"unpack": true
-},
-{
-"version": "Ninja 1.7.1",
-"size": 184821,
-"digest": "e4f9a1ae624a2630e75264ba37d396d9c7407d6e6aea3763056210ba6e1387908bd31cf4037a6a3661a418e86c4d2761e0c333e6a3bd0d66549d2b0d72d3f43b",
-"algorithm": "sha512",
-"filename": "ninja171.zip",
-"unpack": true
-}
-]
diff --git a/application/basilisk/config/tooltool-manifests/win32/clang.manifest b/application/basilisk/config/tooltool-manifests/win32/clang.manifest
deleted file mode 100644
index 1cf2b6306..000000000
--- a/application/basilisk/config/tooltool-manifests/win32/clang.manifest
+++ /dev/null
@@ -1,50 +0,0 @@
-[
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-},
-{
-"version": "rustc 1.14.0 (e8a012324 2016-12-16) repack",
-"size": 63983591,
-"digest": "7bd57c81e57a984a83de75dce214e344cee870bf7e1955ae3831f5a3d638fd4d2d1dca6d434a3264f98bc3b3f00dedb55d0b6d28afd9015d231e8a8f3075dea0",
-"algorithm": "sha512",
-"filename": "rustc.tar.bz2",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.bz2",
-"unpack": true,
-"digest": "7dee5c5602b3830cb8ac45ebaa8542714bbac0e50eabbff58a06972a02ceeab75ed7c56ff22a23f760b8317ae8e9a01cdecfaf75a7acbd2a4cdd817967170d2e",
-"size": 1179901
-},
-{
-"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
-},
-{
-"version": "clang 4.0pre/r286542",
-"size": 222604502,
-"digest": "cea6119131adb66e0b7ec5030b00922ac95e4e97249fcab9561a848ea60b7f80536c9171a07136afcb79decbcdb20099a5e7ee493013710b8ba5ae072ad40851",
-"algorithm": "sha512",
-"filename": "clang.tar.bz2",
-"unpack": true
-},
-{
-"version": "makecab rev d2bc6797648b7a834782714a55d339d2fd4e58c8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "makecab.tar.bz2",
-"unpack": true,
-"digest": "196ac6a567c85559957dfe511c3d8654d23c94d5603259e19ccafe9d71e0e4ccee63ccc9a778f2699654b786cda54266108b7d4db543d01bb0b42545b4e6ec75",
-"size": 297118
-}
-]
diff --git a/application/basilisk/config/tooltool-manifests/win32/l10n.manifest b/application/basilisk/config/tooltool-manifests/win32/l10n.manifest
deleted file mode 100644
index 2e802b78d..000000000
--- a/application/basilisk/config/tooltool-manifests/win32/l10n.manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-}
-]
diff --git a/application/basilisk/config/tooltool-manifests/win32/releng.manifest b/application/basilisk/config/tooltool-manifests/win32/releng.manifest
deleted file mode 100644
index 8ca10949c..000000000
--- a/application/basilisk/config/tooltool-manifests/win32/releng.manifest
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-},
-{
-"version": "rustc 1.14.0 (e8a012324 2016-12-16) repack",
-"size": 63983591,
-"digest": "7bd57c81e57a984a83de75dce214e344cee870bf7e1955ae3831f5a3d638fd4d2d1dca6d434a3264f98bc3b3f00dedb55d0b6d28afd9015d231e8a8f3075dea0",
-"algorithm": "sha512",
-"filename": "rustc.tar.bz2",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.bz2",
-"unpack": true,
-"digest": "7dee5c5602b3830cb8ac45ebaa8542714bbac0e50eabbff58a06972a02ceeab75ed7c56ff22a23f760b8317ae8e9a01cdecfaf75a7acbd2a4cdd817967170d2e",
-"size": 1179901
-},
-{
-"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
-},
-{
-"version": "makecab rev d2bc6797648b7a834782714a55d339d2fd4e58c8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "makecab.tar.bz2",
-"unpack": true,
-"digest": "196ac6a567c85559957dfe511c3d8654d23c94d5603259e19ccafe9d71e0e4ccee63ccc9a778f2699654b786cda54266108b7d4db543d01bb0b42545b4e6ec75",
-"size": 297118
-}
-]
diff --git a/application/basilisk/config/tooltool-manifests/win64/clang.manifest b/application/basilisk/config/tooltool-manifests/win64/clang.manifest
deleted file mode 100644
index 2f064bacb..000000000
--- a/application/basilisk/config/tooltool-manifests/win64/clang.manifest
+++ /dev/null
@@ -1,51 +0,0 @@
-[
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-},
-{
-"version": "rustc 1.14.0 (e8a012324 2016-12-16) repack",
-"size": 69760089,
-"digest": "1ad9b88c90c70a11b76526a437f0f4df9590cd3dced50229a306b4b49fbf22b45871461cff9e33c8aabd00ef7734732f09dae131f1805587bac864e63f24f68f",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "rustc.tar.bz2",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.bz2",
-"unpack": true,
-"digest": "7dee5c5602b3830cb8ac45ebaa8542714bbac0e50eabbff58a06972a02ceeab75ed7c56ff22a23f760b8317ae8e9a01cdecfaf75a7acbd2a4cdd817967170d2e",
-"size": 1179901
-},
-{
-"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
-},
-{
-"version": "clang 4.0pre/r286542",
-"size": 226755339,
-"digest": "3c598607c36e70788ca7dbdf0d835f9e44fbcaa7b1ed77ef9971d743a5a230bebc0ccd2bcdf97f63ed4546d1b83f4c3556f35c30589c755aaaefbd674f750e22",
-"algorithm": "sha512",
-"filename": "clang.tar.bz2",
-"unpack": true
-},
-{
-"version": "makecab rev d2bc6797648b7a834782714a55d339d2fd4e58c8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "makecab.tar.bz2",
-"unpack": true,
-"digest": "196ac6a567c85559957dfe511c3d8654d23c94d5603259e19ccafe9d71e0e4ccee63ccc9a778f2699654b786cda54266108b7d4db543d01bb0b42545b4e6ec75",
-"size": 297118
-}
-]
diff --git a/application/basilisk/config/tooltool-manifests/win64/l10n.manifest b/application/basilisk/config/tooltool-manifests/win64/l10n.manifest
deleted file mode 100644
index 2e802b78d..000000000
--- a/application/basilisk/config/tooltool-manifests/win64/l10n.manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-}
-]
diff --git a/application/basilisk/config/tooltool-manifests/win64/releng.manifest b/application/basilisk/config/tooltool-manifests/win64/releng.manifest
deleted file mode 100644
index 8b7dbf4f3..000000000
--- a/application/basilisk/config/tooltool-manifests/win64/releng.manifest
+++ /dev/null
@@ -1,43 +0,0 @@
-[
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-},
-{
-"version": "rustc 1.14.0 (e8a012324 2016-12-16) repack",
-"size": 69760089,
-"digest": "1ad9b88c90c70a11b76526a437f0f4df9590cd3dced50229a306b4b49fbf22b45871461cff9e33c8aabd00ef7734732f09dae131f1805587bac864e63f24f68f",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "rustc.tar.bz2",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.bz2",
-"unpack": true,
-"digest": "7dee5c5602b3830cb8ac45ebaa8542714bbac0e50eabbff58a06972a02ceeab75ed7c56ff22a23f760b8317ae8e9a01cdecfaf75a7acbd2a4cdd817967170d2e",
-"size": 1179901
-},
-{
-"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
-},
-{
-"version": "makecab rev d2bc6797648b7a834782714a55d339d2fd4e58c8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "makecab.tar.bz2",
-"unpack": true,
-"digest": "196ac6a567c85559957dfe511c3d8654d23c94d5603259e19ccafe9d71e0e4ccee63ccc9a778f2699654b786cda54266108b7d4db543d01bb0b42545b4e6ec75",
-"size": 297118
-}
-]
diff --git a/application/basilisk/config/version.txt b/application/basilisk/config/version.txt
deleted file mode 100644
index b406fbef6..000000000
--- a/application/basilisk/config/version.txt
+++ /dev/null
@@ -1 +0,0 @@
-55.0.0
diff --git a/application/basilisk/config/version_display.txt b/application/basilisk/config/version_display.txt
deleted file mode 100644
index b406fbef6..000000000
--- a/application/basilisk/config/version_display.txt
+++ /dev/null
@@ -1 +0,0 @@
-55.0.0
author	Matt A. Tobin <email@mattatobin.com>	2018-02-02 05:06:10 -0500
committer	Matt A. Tobin <email@mattatobin.com>	2018-02-02 05:06:10 -0500
commit	6d614170cbfa958564eb5f824234ad5a9e484344 (patch)
tree	3e1eb384382f30987cb2e64bd654afa8b74fd06b /application/basilisk/config
parent	2a6b605d64b19411a300efdbbd7f78c349f90206 (diff)
download	UXP-6d614170cbfa958564eb5f824234ad5a9e484344.tar UXP-6d614170cbfa958564eb5f824234ad5a9e484344.tar.gz UXP-6d614170cbfa958564eb5f824234ad5a9e484344.tar.lz UXP-6d614170cbfa958564eb5f824234ad5a9e484344.tar.xz UXP-6d614170cbfa958564eb5f824234ad5a9e484344.zip