summaryrefslogtreecommitdiffstats
path: root/webbrowser/config
diff options
context:
space:
mode:
Diffstat (limited to 'webbrowser/config')
-rw-r--r--webbrowser/config/mozconfig9
-rw-r--r--webbrowser/config/mozconfigs/common7
-rw-r--r--webbrowser/config/mozconfigs/linux32/beta7
-rw-r--r--webbrowser/config/mozconfigs/linux32/common-opt19
-rw-r--r--webbrowser/config/mozconfigs/linux32/debug22
-rw-r--r--webbrowser/config/mozconfigs/linux32/debug-asan20
-rw-r--r--webbrowser/config/mozconfigs/linux32/l10n-mozconfig12
-rw-r--r--webbrowser/config/mozconfigs/linux32/release13
-rw-r--r--webbrowser/config/mozconfigs/linux32/valgrind11
-rw-r--r--webbrowser/config/mozconfigs/linux64/beta7
-rw-r--r--webbrowser/config/mozconfigs/linux64/common-opt19
-rw-r--r--webbrowser/config/mozconfigs/linux64/debug22
-rw-r--r--webbrowser/config/mozconfigs/linux64/debug-asan20
-rw-r--r--webbrowser/config/mozconfigs/linux64/debug-static-analysis-clang15
-rw-r--r--webbrowser/config/mozconfigs/linux64/l10n-mozconfig12
-rw-r--r--webbrowser/config/mozconfigs/linux64/release13
-rw-r--r--webbrowser/config/mozconfigs/linux64/valgrind11
-rw-r--r--webbrowser/config/mozconfigs/macosx-universal/beta5
-rw-r--r--webbrowser/config/mozconfigs/macosx-universal/common-opt19
-rw-r--r--webbrowser/config/mozconfigs/macosx-universal/l10n-mozconfig11
-rw-r--r--webbrowser/config/mozconfigs/macosx-universal/release11
-rw-r--r--webbrowser/config/mozconfigs/macosx64/debug19
-rw-r--r--webbrowser/config/mozconfigs/macosx64/debug-asan16
-rw-r--r--webbrowser/config/mozconfigs/macosx64/l10n-mozconfig8
-rw-r--r--webbrowser/config/mozconfigs/win32/beta7
-rw-r--r--webbrowser/config/mozconfigs/win32/common-opt33
-rw-r--r--webbrowser/config/mozconfigs/win32/debug26
-rw-r--r--webbrowser/config/mozconfigs/win32/l10n-mozconfig16
-rw-r--r--webbrowser/config/mozconfigs/win32/release13
-rw-r--r--webbrowser/config/mozconfigs/win64/debug22
-rw-r--r--webbrowser/config/mozconfigs/win64/nightly26
-rw-r--r--webbrowser/config/tooltool-manifests/linux32/clang.manifest17
-rw-r--r--webbrowser/config/tooltool-manifests/linux32/releng.manifest1
-rw-r--r--webbrowser/config/tooltool-manifests/linux64/clang.manifest17
-rw-r--r--webbrowser/config/tooltool-manifests/linux64/releng.manifest1
-rw-r--r--webbrowser/config/tooltool-manifests/macosx64/releng.manifest17
-rw-r--r--webbrowser/config/version.txt1
37 files changed, 525 insertions, 0 deletions
diff --git a/webbrowser/config/mozconfig b/webbrowser/config/mozconfig
new file mode 100644
index 0000000..ad2e3a4
--- /dev/null
+++ b/webbrowser/config/mozconfig
@@ -0,0 +1,9 @@
+# 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/webbrowser/config/mozconfigs/common b/webbrowser/config/mozconfigs/common
new file mode 100644
index 0000000..febf562
--- /dev/null
+++ b/webbrowser/config/mozconfigs/common
@@ -0,0 +1,7 @@
+# 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/webbrowser/config/mozconfigs/linux32/beta b/webbrowser/config/mozconfigs/linux32/beta
new file mode 100644
index 0000000..6a42104
--- /dev/null
+++ b/webbrowser/config/mozconfigs/linux32/beta
@@ -0,0 +1,7 @@
+. "$topsrcdir/browser/config/mozconfigs/linux32/common-opt"
+
+ac_add_options --enable-official-branding
+
+mk_add_options MOZ_PGO=1
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/webbrowser/config/mozconfigs/linux32/common-opt b/webbrowser/config/mozconfigs/linux32/common-opt
new file mode 100644
index 0000000..9e5e78d
--- /dev/null
+++ b/webbrowser/config/mozconfigs/linux32/common-opt
@@ -0,0 +1,19 @@
+# This file is sourced by nightly, beta, and release mozconfigs.
+
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+ac_add_options --with-google-api-keyfile=/builds/gapi.data
+
+. $topsrcdir/build/unix/mozconfig.linux32
+
+# Avoid dependency on libstdc++ 4.5
+ac_add_options --enable-stdcxx-compat
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
diff --git a/webbrowser/config/mozconfigs/linux32/debug b/webbrowser/config/mozconfigs/linux32/debug
new file mode 100644
index 0000000..2328367
--- /dev/null
+++ b/webbrowser/config/mozconfigs/linux32/debug
@@ -0,0 +1,22 @@
+ac_add_options --enable-debug
+ac_add_options --enable-trace-malloc
+ac_add_options --enable-signmar
+
+. $topsrcdir/build/unix/mozconfig.linux32
+
+# Avoid dependency on libstdc++ 4.5
+ac_add_options --enable-stdcxx-compat
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+#Use ccache
+ac_add_options --with-ccache=/usr/bin/ccache
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/webbrowser/config/mozconfigs/linux32/debug-asan b/webbrowser/config/mozconfigs/linux32/debug-asan
new file mode 100644
index 0000000..4766ce2
--- /dev/null
+++ b/webbrowser/config/mozconfigs/linux32/debug-asan
@@ -0,0 +1,20 @@
+# 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
+
+# Avoid dependency on libstdc++ 4.5
+ac_add_options --enable-stdcxx-compat
+
+# 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/webbrowser/config/mozconfigs/linux32/l10n-mozconfig b/webbrowser/config/mozconfigs/linux32/l10n-mozconfig
new file mode 100644
index 0000000..d8d6228
--- /dev/null
+++ b/webbrowser/config/mozconfigs/linux32/l10n-mozconfig
@@ -0,0 +1,12 @@
+ac_add_options --with-l10n-base=../../l10n
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+
+# Avoid dependency on libstdc++ 4.5
+ac_add_options --enable-stdcxx-compat
+
+. $topsrcdir/build/unix/mozconfig.linux32
+
+export MOZILLA_OFFICIAL=1
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/webbrowser/config/mozconfigs/linux32/release b/webbrowser/config/mozconfigs/linux32/release
new file mode 100644
index 0000000..b32f1b3
--- /dev/null
+++ b/webbrowser/config/mozconfigs/linux32/release
@@ -0,0 +1,13 @@
+# This make file should be identical to the beta mozconfig, apart from the
+# safeguard below
+. "$topsrcdir/browser/config/mozconfigs/linux32/common-opt"
+
+ac_add_options --enable-official-branding
+
+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/webbrowser/config/mozconfigs/linux32/valgrind b/webbrowser/config/mozconfigs/linux32/valgrind
new file mode 100644
index 0000000..a39b1b0
--- /dev/null
+++ b/webbrowser/config/mozconfigs/linux32/valgrind
@@ -0,0 +1,11 @@
+. $topsrcdir/browser/config/mozconfigs/linux32/nightly
+
+ac_add_options --enable-valgrind
+ac_add_options --disable-jemalloc
+ac_add_options --disable-elf-hack
+ac_add_options --enable-optimize="-g -O -freorder-blocks"
+ac_add_options --disable-install-strip
+
+# 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/webbrowser/config/mozconfigs/linux64/beta b/webbrowser/config/mozconfigs/linux64/beta
new file mode 100644
index 0000000..7c05460
--- /dev/null
+++ b/webbrowser/config/mozconfigs/linux64/beta
@@ -0,0 +1,7 @@
+. "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
+
+ac_add_options --enable-official-branding
+
+mk_add_options MOZ_PGO=1
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/webbrowser/config/mozconfigs/linux64/common-opt b/webbrowser/config/mozconfigs/linux64/common-opt
new file mode 100644
index 0000000..c448460
--- /dev/null
+++ b/webbrowser/config/mozconfigs/linux64/common-opt
@@ -0,0 +1,19 @@
+# This file is sourced by the nightly, beta, and release mozconfigs.
+
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+ac_add_options --with-google-api-keyfile=/builds/gapi.data
+
+. $topsrcdir/build/unix/mozconfig.linux
+
+# Avoid dependency on libstdc++ 4.5
+ac_add_options --enable-stdcxx-compat
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
diff --git a/webbrowser/config/mozconfigs/linux64/debug b/webbrowser/config/mozconfigs/linux64/debug
new file mode 100644
index 0000000..c917660
--- /dev/null
+++ b/webbrowser/config/mozconfigs/linux64/debug
@@ -0,0 +1,22 @@
+ac_add_options --enable-debug
+ac_add_options --enable-trace-malloc
+ac_add_options --enable-signmar
+
+. $topsrcdir/build/unix/mozconfig.linux
+
+# Avoid dependency on libstdc++ 4.5
+ac_add_options --enable-stdcxx-compat
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Use ccache
+ac_add_options --with-ccache=/usr/bin/ccache
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/webbrowser/config/mozconfigs/linux64/debug-asan b/webbrowser/config/mozconfigs/linux64/debug-asan
new file mode 100644
index 0000000..4766ce2
--- /dev/null
+++ b/webbrowser/config/mozconfigs/linux64/debug-asan
@@ -0,0 +1,20 @@
+# 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
+
+# Avoid dependency on libstdc++ 4.5
+ac_add_options --enable-stdcxx-compat
+
+# 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/webbrowser/config/mozconfigs/linux64/debug-static-analysis-clang b/webbrowser/config/mozconfigs/linux64/debug-static-analysis-clang
new file mode 100644
index 0000000..214d156
--- /dev/null
+++ b/webbrowser/config/mozconfigs/linux64/debug-static-analysis-clang
@@ -0,0 +1,15 @@
+. "$topsrcdir/build/mozconfig.common"
+
+ac_add_options --enable-debug
+
+# 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
+
+# Avoid dependency on libstdc++ 4.5
+ac_add_options --enable-stdcxx-compat
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/webbrowser/config/mozconfigs/linux64/l10n-mozconfig b/webbrowser/config/mozconfigs/linux64/l10n-mozconfig
new file mode 100644
index 0000000..52470c5
--- /dev/null
+++ b/webbrowser/config/mozconfigs/linux64/l10n-mozconfig
@@ -0,0 +1,12 @@
+ac_add_options --with-l10n-base=../../l10n
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+
+# Avoid dependency on libstdc++ 4.5
+ac_add_options --enable-stdcxx-compat
+
+. $topsrcdir/build/unix/mozconfig.linux
+
+export MOZILLA_OFFICIAL=1
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/webbrowser/config/mozconfigs/linux64/release b/webbrowser/config/mozconfigs/linux64/release
new file mode 100644
index 0000000..e52f33f
--- /dev/null
+++ b/webbrowser/config/mozconfigs/linux64/release
@@ -0,0 +1,13 @@
+# This make file should be identical to the beta mozconfig, apart from the
+# safeguard below
+. "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
+
+ac_add_options --enable-official-branding
+
+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/webbrowser/config/mozconfigs/linux64/valgrind b/webbrowser/config/mozconfigs/linux64/valgrind
new file mode 100644
index 0000000..ccf8971
--- /dev/null
+++ b/webbrowser/config/mozconfigs/linux64/valgrind
@@ -0,0 +1,11 @@
+. $topsrcdir/browser/config/mozconfigs/linux64/nightly
+
+ac_add_options --enable-valgrind
+ac_add_options --disable-jemalloc
+ac_add_options --disable-elf-hack
+ac_add_options --enable-optimize="-g -O -freorder-blocks"
+ac_add_options --disable-install-strip
+
+# 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/webbrowser/config/mozconfigs/macosx-universal/beta b/webbrowser/config/mozconfigs/macosx-universal/beta
new file mode 100644
index 0000000..cc2f44d
--- /dev/null
+++ b/webbrowser/config/mozconfigs/macosx-universal/beta
@@ -0,0 +1,5 @@
+. "$topsrcdir/browser/config/mozconfigs/macosx-universal/common-opt"
+
+ac_add_options --enable-official-branding
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/webbrowser/config/mozconfigs/macosx-universal/common-opt b/webbrowser/config/mozconfigs/macosx-universal/common-opt
new file mode 100644
index 0000000..414f690
--- /dev/null
+++ b/webbrowser/config/mozconfigs/macosx-universal/common-opt
@@ -0,0 +1,19 @@
+# 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 --enable-update-packaging
+ac_add_options --with-google-api-keyfile=/builds/gapi.data
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
diff --git a/webbrowser/config/mozconfigs/macosx-universal/l10n-mozconfig b/webbrowser/config/mozconfigs/macosx-universal/l10n-mozconfig
new file mode 100644
index 0000000..2f88f19
--- /dev/null
+++ b/webbrowser/config/mozconfigs/macosx-universal/l10n-mozconfig
@@ -0,0 +1,11 @@
+. "$topsrcdir/browser/config/mozconfigs/common"
+
+ac_add_options --with-l10n-base=../../../l10n
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+ac_add_options --with-macbundlename-prefix=Firefox
+ac_add_options --with-ccache
+
+export MOZILLA_OFFICIAL=1
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/webbrowser/config/mozconfigs/macosx-universal/release b/webbrowser/config/mozconfigs/macosx-universal/release
new file mode 100644
index 0000000..ab8a469
--- /dev/null
+++ b/webbrowser/config/mozconfigs/macosx-universal/release
@@ -0,0 +1,11 @@
+# This make file should be identical to the beta mozconfig, apart from the
+# safeguard below
+. "$topsrcdir/browser/config/mozconfigs/macosx-universal/common-opt"
+
+ac_add_options --enable-official-branding
+
+# 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/webbrowser/config/mozconfigs/macosx64/debug b/webbrowser/config/mozconfigs/macosx64/debug
new file mode 100644
index 0000000..ebf8099
--- /dev/null
+++ b/webbrowser/config/mozconfigs/macosx64/debug
@@ -0,0 +1,19 @@
+. $topsrcdir/build/macosx/mozconfig.common
+
+ac_add_options --enable-debug
+ac_add_options --enable-trace-malloc
+ac_add_options --enable-accessibility
+ac_add_options --enable-signmar
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+ac_add_options --with-macbundlename-prefix=Firefox
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/webbrowser/config/mozconfigs/macosx64/debug-asan b/webbrowser/config/mozconfigs/macosx64/debug-asan
new file mode 100644
index 0000000..97ced38
--- /dev/null
+++ b/webbrowser/config/mozconfigs/macosx64/debug-asan
@@ -0,0 +1,16 @@
+. $topsrcdir/build/unix/mozconfig.asan
+
+ac_add_options --enable-application=browser
+ac_add_options --enable-debug
+ac_add_options --enable-optimize="-O1"
+ac_add_options --enable-accessibility
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
+
+ac_add_options --with-macbundlename-prefix=Firefox
+
+# 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/webbrowser/config/mozconfigs/macosx64/l10n-mozconfig b/webbrowser/config/mozconfigs/macosx64/l10n-mozconfig
new file mode 100644
index 0000000..b2cfa21
--- /dev/null
+++ b/webbrowser/config/mozconfigs/macosx64/l10n-mozconfig
@@ -0,0 +1,8 @@
+. "$topsrcdir/browser/config/mozconfigs/common"
+
+ac_add_options --with-l10n-base=../../l10n
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+ac_add_options --with-ccache
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/webbrowser/config/mozconfigs/win32/beta b/webbrowser/config/mozconfigs/win32/beta
new file mode 100644
index 0000000..322af12
--- /dev/null
+++ b/webbrowser/config/mozconfigs/win32/beta
@@ -0,0 +1,7 @@
+. "$topsrcdir/browser/config/mozconfigs/win32/common-opt"
+
+mk_add_options MOZ_PGO=1
+
+ac_add_options --enable-official-branding
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/webbrowser/config/mozconfigs/win32/common-opt b/webbrowser/config/mozconfigs/win32/common-opt
new file mode 100644
index 0000000..040f13a
--- /dev/null
+++ b/webbrowser/config/mozconfigs/win32/common-opt
@@ -0,0 +1,33 @@
+# 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-update-packaging
+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}
+
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+if test -z "${_PYMAKE}"; then
+ mk_add_options MOZ_MAKE_FLAGS=-j1
+fi
+
+if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
+ . $topsrcdir/build/win32/mozconfig.vs2010-win64
+else
+ . $topsrcdir/build/win32/mozconfig.vs2010
+fi
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
diff --git a/webbrowser/config/mozconfigs/win32/debug b/webbrowser/config/mozconfigs/win32/debug
new file mode 100644
index 0000000..3b4dcc1
--- /dev/null
+++ b/webbrowser/config/mozconfigs/win32/debug
@@ -0,0 +1,26 @@
+. "$topsrcdir/browser/config/mozconfigs/common"
+
+ac_add_options --enable-debug
+ac_add_options --enable-trace-malloc
+ac_add_options --enable-signmar
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+if test -z "${_PYMAKE}"; then
+ mk_add_options MOZ_MAKE_FLAGS=-j1
+fi
+
+if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
+ . $topsrcdir/build/win32/mozconfig.vs2010-win64
+else
+ . $topsrcdir/build/win32/mozconfig.vs2010
+fi
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/webbrowser/config/mozconfigs/win32/l10n-mozconfig b/webbrowser/config/mozconfigs/win32/l10n-mozconfig
new file mode 100644
index 0000000..4113d99
--- /dev/null
+++ b/webbrowser/config/mozconfigs/win32/l10n-mozconfig
@@ -0,0 +1,16 @@
+. "$topsrcdir/browser/config/mozconfigs/common"
+
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+ac_add_options --with-l10n-base=../../l10n
+ac_add_options --with-windows-version=601
+
+export MOZILLA_OFFICIAL=1
+
+if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
+ . $topsrcdir/build/win32/mozconfig.vs2010-win64
+else
+ . $topsrcdir/build/win32/mozconfig.vs2010
+fi
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/webbrowser/config/mozconfigs/win32/release b/webbrowser/config/mozconfigs/win32/release
new file mode 100644
index 0000000..7feb125
--- /dev/null
+++ b/webbrowser/config/mozconfigs/win32/release
@@ -0,0 +1,13 @@
+# This make file should be identical to the beta mozconfig, apart from the
+# safeguard below
+. "$topsrcdir/browser/config/mozconfigs/win32/common-opt"
+
+mk_add_options MOZ_PGO=1
+
+ac_add_options --enable-official-branding
+
+# 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/webbrowser/config/mozconfigs/win64/debug b/webbrowser/config/mozconfigs/win64/debug
new file mode 100644
index 0000000..7320d9c
--- /dev/null
+++ b/webbrowser/config/mozconfigs/win64/debug
@@ -0,0 +1,22 @@
+. "$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-trace-malloc
+ac_add_options --enable-signmar
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+if test -z "${_PYMAKE}"; then
+ mk_add_options MOZ_MAKE_FLAGS=-j1
+fi
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
+
+. $topsrcdir/build/win64/mozconfig.vs2010
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/webbrowser/config/mozconfigs/win64/nightly b/webbrowser/config/mozconfigs/win64/nightly
new file mode 100644
index 0000000..59b31df
--- /dev/null
+++ b/webbrowser/config/mozconfigs/win64/nightly
@@ -0,0 +1,26 @@
+. "$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-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+ac_add_options --enable-jemalloc
+ac_add_options --enable-signmar
+
+# Nightlies only since this has a cost in performance
+ac_add_options --enable-js-diagnostics
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+if test -z "${_PYMAKE}"; then
+ mk_add_options MOZ_MAKE_FLAGS=-j1
+fi
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
+
+. $topsrcdir/build/win64/mozconfig.vs2010
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/webbrowser/config/tooltool-manifests/linux32/clang.manifest b/webbrowser/config/tooltool-manifests/linux32/clang.manifest
new file mode 100644
index 0000000..8ce74c6
--- /dev/null
+++ b/webbrowser/config/tooltool-manifests/linux32/clang.manifest
@@ -0,0 +1,17 @@
+[
+{
+"clang_version": "r170890"
+},
+{
+"filename": "setup.sh",
+"algorithm": "sha512",
+"digest": "2005a41fe97a5e00997063705f39d42b6a43b1cf7ba306cbc7b1513de34cdcd050fc6326efa2107f19ba0cc67914745dbf13154fa748010a93cf072481ef4aaa",
+"size": 47
+},
+{
+"filename": "clang.tar.bz2",
+"algorithm": "sha512",
+"digest": "0bcfc19f05cc0f042befb3823c7ecce9ba411b152921aa29e97e7adc846e0258fd7da521b1620cb1e61a19d2fcac9b60e6d613c922b6c153e01b9b0766651d09",
+"size": 62708281
+}
+]
diff --git a/webbrowser/config/tooltool-manifests/linux32/releng.manifest b/webbrowser/config/tooltool-manifests/linux32/releng.manifest
new file mode 100644
index 0000000..fe51488
--- /dev/null
+++ b/webbrowser/config/tooltool-manifests/linux32/releng.manifest
@@ -0,0 +1 @@
+[]
diff --git a/webbrowser/config/tooltool-manifests/linux64/clang.manifest b/webbrowser/config/tooltool-manifests/linux64/clang.manifest
new file mode 100644
index 0000000..39ba559
--- /dev/null
+++ b/webbrowser/config/tooltool-manifests/linux64/clang.manifest
@@ -0,0 +1,17 @@
+[
+{
+"clang_version": "r170890"
+},
+{
+"filename": "setup.sh",
+"algorithm": "sha512",
+"digest": "2005a41fe97a5e00997063705f39d42b6a43b1cf7ba306cbc7b1513de34cdcd050fc6326efa2107f19ba0cc67914745dbf13154fa748010a93cf072481ef4aaa",
+"size": 47
+},
+{
+"filename": "clang.tar.bz2",
+"algorithm": "sha512",
+"digest": "e14ccefd965372a57c540647b2b99e21a4aa82f81a8b9a9e18dac7cba4c3436181bef0dfab8c51bcb5c343f504a693fdcfbe7d609f10291b5dd65ab059979d29",
+"size": 63034761
+}
+]
diff --git a/webbrowser/config/tooltool-manifests/linux64/releng.manifest b/webbrowser/config/tooltool-manifests/linux64/releng.manifest
new file mode 100644
index 0000000..fe51488
--- /dev/null
+++ b/webbrowser/config/tooltool-manifests/linux64/releng.manifest
@@ -0,0 +1 @@
+[]
diff --git a/webbrowser/config/tooltool-manifests/macosx64/releng.manifest b/webbrowser/config/tooltool-manifests/macosx64/releng.manifest
new file mode 100644
index 0000000..ede87d3
--- /dev/null
+++ b/webbrowser/config/tooltool-manifests/macosx64/releng.manifest
@@ -0,0 +1,17 @@
+[
+{
+"clang_version": "r170890"
+},
+{
+"size": 47,
+"digest": "2005a41fe97a5e00997063705f39d42b6a43b1cf7ba306cbc7b1513de34cdcd050fc6326efa2107f19ba0cc67914745dbf13154fa748010a93cf072481ef4aaa",
+"algorithm": "sha512",
+"filename": "setup.sh"
+},
+{
+"size": 56126352,
+"digest": "e156e2a39abd5bf272ee30748a6825f22ddd27565b097c66662a2a6f2e9892bc5b4bf30a3552dffbe867dbfc39e7ee086e0b2cd7935f6ea216c0cf936178a88f",
+"algorithm": "sha512",
+"filename": "clang.tar.bz2"
+}
+]
diff --git a/webbrowser/config/version.txt b/webbrowser/config/version.txt
new file mode 100644
index 0000000..cde7790
--- /dev/null
+++ b/webbrowser/config/version.txt
@@ -0,0 +1 @@
+28.8.4