From f9cab004186edb425a9b88ad649726605080a17c Mon Sep 17 00:00:00 2001 From: Thomas Groman Date: Mon, 20 Apr 2020 20:49:37 -0700 Subject: move browser to webbrowser/ --- config/mozconfigs/common | 7 ----- config/mozconfigs/linux32/beta | 7 ----- config/mozconfigs/linux32/common-opt | 19 ------------- config/mozconfigs/linux32/debug | 22 --------------- config/mozconfigs/linux32/debug-asan | 20 ------------- config/mozconfigs/linux32/l10n-mozconfig | 12 -------- config/mozconfigs/linux32/release | 13 --------- config/mozconfigs/linux32/valgrind | 11 -------- config/mozconfigs/linux64/beta | 7 ----- config/mozconfigs/linux64/common-opt | 19 ------------- config/mozconfigs/linux64/debug | 22 --------------- config/mozconfigs/linux64/debug-asan | 20 ------------- .../mozconfigs/linux64/debug-static-analysis-clang | 15 ---------- config/mozconfigs/linux64/l10n-mozconfig | 12 -------- config/mozconfigs/linux64/release | 13 --------- config/mozconfigs/linux64/valgrind | 11 -------- config/mozconfigs/macosx-universal/beta | 5 ---- config/mozconfigs/macosx-universal/common-opt | 19 ------------- config/mozconfigs/macosx-universal/l10n-mozconfig | 11 -------- config/mozconfigs/macosx-universal/release | 11 -------- config/mozconfigs/macosx64/debug | 19 ------------- config/mozconfigs/macosx64/debug-asan | 16 ----------- config/mozconfigs/macosx64/l10n-mozconfig | 8 ------ config/mozconfigs/win32/beta | 7 ----- config/mozconfigs/win32/common-opt | 33 ---------------------- config/mozconfigs/win32/debug | 26 ----------------- config/mozconfigs/win32/l10n-mozconfig | 16 ----------- config/mozconfigs/win32/release | 13 --------- config/mozconfigs/win64/debug | 22 --------------- config/mozconfigs/win64/nightly | 26 ----------------- 30 files changed, 462 deletions(-) delete mode 100644 config/mozconfigs/common delete mode 100644 config/mozconfigs/linux32/beta delete mode 100644 config/mozconfigs/linux32/common-opt delete mode 100644 config/mozconfigs/linux32/debug delete mode 100644 config/mozconfigs/linux32/debug-asan delete mode 100644 config/mozconfigs/linux32/l10n-mozconfig delete mode 100644 config/mozconfigs/linux32/release delete mode 100644 config/mozconfigs/linux32/valgrind delete mode 100644 config/mozconfigs/linux64/beta delete mode 100644 config/mozconfigs/linux64/common-opt delete mode 100644 config/mozconfigs/linux64/debug delete mode 100644 config/mozconfigs/linux64/debug-asan delete mode 100644 config/mozconfigs/linux64/debug-static-analysis-clang delete mode 100644 config/mozconfigs/linux64/l10n-mozconfig delete mode 100644 config/mozconfigs/linux64/release delete mode 100644 config/mozconfigs/linux64/valgrind delete mode 100644 config/mozconfigs/macosx-universal/beta delete mode 100644 config/mozconfigs/macosx-universal/common-opt delete mode 100644 config/mozconfigs/macosx-universal/l10n-mozconfig delete mode 100644 config/mozconfigs/macosx-universal/release delete mode 100644 config/mozconfigs/macosx64/debug delete mode 100644 config/mozconfigs/macosx64/debug-asan delete mode 100644 config/mozconfigs/macosx64/l10n-mozconfig delete mode 100644 config/mozconfigs/win32/beta delete mode 100644 config/mozconfigs/win32/common-opt delete mode 100644 config/mozconfigs/win32/debug delete mode 100644 config/mozconfigs/win32/l10n-mozconfig delete mode 100644 config/mozconfigs/win32/release delete mode 100644 config/mozconfigs/win64/debug delete mode 100644 config/mozconfigs/win64/nightly (limited to 'config/mozconfigs') diff --git a/config/mozconfigs/common b/config/mozconfigs/common deleted file mode 100644 index febf562..0000000 --- a/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/config/mozconfigs/linux32/beta b/config/mozconfigs/linux32/beta deleted file mode 100644 index 6a42104..0000000 --- a/config/mozconfigs/linux32/beta +++ /dev/null @@ -1,7 +0,0 @@ -. "$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/config/mozconfigs/linux32/common-opt b/config/mozconfigs/linux32/common-opt deleted file mode 100644 index 9e5e78d..0000000 --- a/config/mozconfigs/linux32/common-opt +++ /dev/null @@ -1,19 +0,0 @@ -# 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/config/mozconfigs/linux32/debug b/config/mozconfigs/linux32/debug deleted file mode 100644 index 2328367..0000000 --- a/config/mozconfigs/linux32/debug +++ /dev/null @@ -1,22 +0,0 @@ -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/config/mozconfigs/linux32/debug-asan b/config/mozconfigs/linux32/debug-asan deleted file mode 100644 index 4766ce2..0000000 --- a/config/mozconfigs/linux32/debug-asan +++ /dev/null @@ -1,20 +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 - -# 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/config/mozconfigs/linux32/l10n-mozconfig b/config/mozconfigs/linux32/l10n-mozconfig deleted file mode 100644 index d8d6228..0000000 --- a/config/mozconfigs/linux32/l10n-mozconfig +++ /dev/null @@ -1,12 +0,0 @@ -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/config/mozconfigs/linux32/release b/config/mozconfigs/linux32/release deleted file mode 100644 index b32f1b3..0000000 --- a/config/mozconfigs/linux32/release +++ /dev/null @@ -1,13 +0,0 @@ -# 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/config/mozconfigs/linux32/valgrind b/config/mozconfigs/linux32/valgrind deleted file mode 100644 index a39b1b0..0000000 --- a/config/mozconfigs/linux32/valgrind +++ /dev/null @@ -1,11 +0,0 @@ -. $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/config/mozconfigs/linux64/beta b/config/mozconfigs/linux64/beta deleted file mode 100644 index 7c05460..0000000 --- a/config/mozconfigs/linux64/beta +++ /dev/null @@ -1,7 +0,0 @@ -. "$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/config/mozconfigs/linux64/common-opt b/config/mozconfigs/linux64/common-opt deleted file mode 100644 index c448460..0000000 --- a/config/mozconfigs/linux64/common-opt +++ /dev/null @@ -1,19 +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 --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/config/mozconfigs/linux64/debug b/config/mozconfigs/linux64/debug deleted file mode 100644 index c917660..0000000 --- a/config/mozconfigs/linux64/debug +++ /dev/null @@ -1,22 +0,0 @@ -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/config/mozconfigs/linux64/debug-asan b/config/mozconfigs/linux64/debug-asan deleted file mode 100644 index 4766ce2..0000000 --- a/config/mozconfigs/linux64/debug-asan +++ /dev/null @@ -1,20 +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 - -# 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/config/mozconfigs/linux64/debug-static-analysis-clang b/config/mozconfigs/linux64/debug-static-analysis-clang deleted file mode 100644 index 214d156..0000000 --- a/config/mozconfigs/linux64/debug-static-analysis-clang +++ /dev/null @@ -1,15 +0,0 @@ -. "$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/config/mozconfigs/linux64/l10n-mozconfig b/config/mozconfigs/linux64/l10n-mozconfig deleted file mode 100644 index 52470c5..0000000 --- a/config/mozconfigs/linux64/l10n-mozconfig +++ /dev/null @@ -1,12 +0,0 @@ -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/config/mozconfigs/linux64/release b/config/mozconfigs/linux64/release deleted file mode 100644 index e52f33f..0000000 --- a/config/mozconfigs/linux64/release +++ /dev/null @@ -1,13 +0,0 @@ -# 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/config/mozconfigs/linux64/valgrind b/config/mozconfigs/linux64/valgrind deleted file mode 100644 index ccf8971..0000000 --- a/config/mozconfigs/linux64/valgrind +++ /dev/null @@ -1,11 +0,0 @@ -. $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/config/mozconfigs/macosx-universal/beta b/config/mozconfigs/macosx-universal/beta deleted file mode 100644 index cc2f44d..0000000 --- a/config/mozconfigs/macosx-universal/beta +++ /dev/null @@ -1,5 +0,0 @@ -. "$topsrcdir/browser/config/mozconfigs/macosx-universal/common-opt" - -ac_add_options --enable-official-branding - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/config/mozconfigs/macosx-universal/common-opt b/config/mozconfigs/macosx-universal/common-opt deleted file mode 100644 index 414f690..0000000 --- a/config/mozconfigs/macosx-universal/common-opt +++ /dev/null @@ -1,19 +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 --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/config/mozconfigs/macosx-universal/l10n-mozconfig b/config/mozconfigs/macosx-universal/l10n-mozconfig deleted file mode 100644 index 2f88f19..0000000 --- a/config/mozconfigs/macosx-universal/l10n-mozconfig +++ /dev/null @@ -1,11 +0,0 @@ -. "$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/config/mozconfigs/macosx-universal/release b/config/mozconfigs/macosx-universal/release deleted file mode 100644 index ab8a469..0000000 --- a/config/mozconfigs/macosx-universal/release +++ /dev/null @@ -1,11 +0,0 @@ -# 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/config/mozconfigs/macosx64/debug b/config/mozconfigs/macosx64/debug deleted file mode 100644 index ebf8099..0000000 --- a/config/mozconfigs/macosx64/debug +++ /dev/null @@ -1,19 +0,0 @@ -. $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/config/mozconfigs/macosx64/debug-asan b/config/mozconfigs/macosx64/debug-asan deleted file mode 100644 index 97ced38..0000000 --- a/config/mozconfigs/macosx64/debug-asan +++ /dev/null @@ -1,16 +0,0 @@ -. $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/config/mozconfigs/macosx64/l10n-mozconfig b/config/mozconfigs/macosx64/l10n-mozconfig deleted file mode 100644 index b2cfa21..0000000 --- a/config/mozconfigs/macosx64/l10n-mozconfig +++ /dev/null @@ -1,8 +0,0 @@ -. "$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/config/mozconfigs/win32/beta b/config/mozconfigs/win32/beta deleted file mode 100644 index 322af12..0000000 --- a/config/mozconfigs/win32/beta +++ /dev/null @@ -1,7 +0,0 @@ -. "$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/config/mozconfigs/win32/common-opt b/config/mozconfigs/win32/common-opt deleted file mode 100644 index 040f13a..0000000 --- a/config/mozconfigs/win32/common-opt +++ /dev/null @@ -1,33 +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-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/config/mozconfigs/win32/debug b/config/mozconfigs/win32/debug deleted file mode 100644 index 3b4dcc1..0000000 --- a/config/mozconfigs/win32/debug +++ /dev/null @@ -1,26 +0,0 @@ -. "$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/config/mozconfigs/win32/l10n-mozconfig b/config/mozconfigs/win32/l10n-mozconfig deleted file mode 100644 index 4113d99..0000000 --- a/config/mozconfigs/win32/l10n-mozconfig +++ /dev/null @@ -1,16 +0,0 @@ -. "$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/config/mozconfigs/win32/release b/config/mozconfigs/win32/release deleted file mode 100644 index 7feb125..0000000 --- a/config/mozconfigs/win32/release +++ /dev/null @@ -1,13 +0,0 @@ -# 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/config/mozconfigs/win64/debug b/config/mozconfigs/win64/debug deleted file mode 100644 index 7320d9c..0000000 --- a/config/mozconfigs/win64/debug +++ /dev/null @@ -1,22 +0,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-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/config/mozconfigs/win64/nightly b/config/mozconfigs/win64/nightly deleted file mode 100644 index 59b31df..0000000 --- a/config/mozconfigs/win64/nightly +++ /dev/null @@ -1,26 +0,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-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" -- cgit v1.2.3