From 4bbcffd151b1deff3b630a9063681e88bf6efb83 Mon Sep 17 00:00:00 2001 From: Steve Fink Date: Tue, 4 Sep 2012 16:01:23 -0700 Subject: [PATCH] Backed out changeset 81bbb0b8aff2 (bug 738612) --- b2g/config/mozconfigs/common | 2 +- b2g/config/mozconfigs/gb_armv7a_gecko/debug | 2 -- b2g/config/mozconfigs/gb_armv7a_gecko/nightly | 2 -- b2g/config/mozconfigs/ics_armv7a_gecko/debug | 2 -- b2g/config/mozconfigs/ics_armv7a_gecko/nightly | 2 -- b2g/config/mozconfigs/linux32_gecko/nightly | 2 -- b2g/config/mozconfigs/linux64_gecko/nightly | 2 -- b2g/config/mozconfigs/macosx64_gecko/nightly | 2 -- b2g/config/mozconfigs/win32_gecko/nightly | 2 -- browser/config/mozconfigs/linux32/debug | 2 -- browser/config/mozconfigs/linux32/debug-asan | 2 -- browser/config/mozconfigs/linux32/l10n-mozconfig | 2 -- browser/config/mozconfigs/linux32/nightly | 2 -- browser/config/mozconfigs/linux32/nightly-asan | 2 -- browser/config/mozconfigs/linux32/qt | 2 -- browser/config/mozconfigs/linux32/release | 2 -- browser/config/mozconfigs/linux32/rpm | 2 -- browser/config/mozconfigs/linux32/valgrind | 2 -- browser/config/mozconfigs/linux64/debug | 2 -- browser/config/mozconfigs/linux64/debug-asan | 2 -- browser/config/mozconfigs/linux64/l10n-mozconfig | 2 -- browser/config/mozconfigs/linux64/nightly | 2 -- browser/config/mozconfigs/linux64/nightly-asan | 2 -- browser/config/mozconfigs/linux64/release | 2 -- browser/config/mozconfigs/linux64/rpm | 2 -- browser/config/mozconfigs/linux64/valgrind | 2 -- browser/config/mozconfigs/macosx-universal/nightly | 2 -- browser/config/mozconfigs/macosx-universal/release | 2 -- browser/config/mozconfigs/macosx-universal/shark | 2 -- browser/config/mozconfigs/macosx32/debug | 2 -- browser/config/mozconfigs/macosx64/debug | 2 -- browser/config/mozconfigs/macosx64/debug-asan | 2 -- browser/config/mozconfigs/macosx64/l10n-mozconfig | 2 -- browser/config/mozconfigs/win32/debug | 2 -- browser/config/mozconfigs/win32/l10n-mozconfig | 2 -- browser/config/mozconfigs/win32/nightly | 2 -- browser/config/mozconfigs/win32/release | 2 -- browser/config/mozconfigs/win64/debug | 2 -- browser/config/mozconfigs/win64/nightly | 2 -- 39 files changed, 1 insertion(+), 77 deletions(-) diff --git a/b2g/config/mozconfigs/common b/b2g/config/mozconfigs/common index 1dae99bacbed..fdf0f49f4a46 100644 --- a/b2g/config/mozconfigs/common +++ b/b2g/config/mozconfigs/common @@ -2,6 +2,6 @@ # 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 at the top of all b2g mozconfigs +# This file is included by all b2g mozconfigs . "$topsrcdir/build/mozconfig.common" diff --git a/b2g/config/mozconfigs/gb_armv7a_gecko/debug b/b2g/config/mozconfigs/gb_armv7a_gecko/debug index dee1f6b84ded..5cdc7a448082 100644 --- a/b2g/config/mozconfigs/gb_armv7a_gecko/debug +++ b/b2g/config/mozconfigs/gb_armv7a_gecko/debug @@ -17,5 +17,3 @@ ENABLE_MARIONETTE=1 # Enable dump() from JS. export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP - -. "$topsrcdir/b2g/config/mozconfigs/common.override" diff --git a/b2g/config/mozconfigs/gb_armv7a_gecko/nightly b/b2g/config/mozconfigs/gb_armv7a_gecko/nightly index e5fdbb360510..4bdd3cb6b8ea 100644 --- a/b2g/config/mozconfigs/gb_armv7a_gecko/nightly +++ b/b2g/config/mozconfigs/gb_armv7a_gecko/nightly @@ -17,5 +17,3 @@ ENABLE_MARIONETTE=1 # Enable dump() from JS. export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP - -. "$topsrcdir/b2g/config/mozconfigs/common.override" diff --git a/b2g/config/mozconfigs/ics_armv7a_gecko/debug b/b2g/config/mozconfigs/ics_armv7a_gecko/debug index 675ec9050b23..64e0fa88a3f2 100644 --- a/b2g/config/mozconfigs/ics_armv7a_gecko/debug +++ b/b2g/config/mozconfigs/ics_armv7a_gecko/debug @@ -18,5 +18,3 @@ ENABLE_MARIONETTE=1 # Enable dump() from JS. export CXXFLAGS="-DMOZ_ENABLE_JS_DUMP -include $topsrcdir/gonk-toolchain/gonk-misc/Unicode.h -include $topsrcdir/gonk-toolchain/system/vold/ResponseCode.h" - -. "$topsrcdir/b2g/config/mozconfigs/common.override" diff --git a/b2g/config/mozconfigs/ics_armv7a_gecko/nightly b/b2g/config/mozconfigs/ics_armv7a_gecko/nightly index 2bbbd13a0c55..94e355a890d4 100644 --- a/b2g/config/mozconfigs/ics_armv7a_gecko/nightly +++ b/b2g/config/mozconfigs/ics_armv7a_gecko/nightly @@ -20,5 +20,3 @@ ENABLE_MARIONETTE=1 # Enable dump() from JS. export CXXFLAGS="-DMOZ_ENABLE_JS_DUMP -include $topsrcdir/gonk-toolchain/gonk-misc/Unicode.h -include $topsrcdir/gonk-toolchain/system/vold/ResponseCode.h" - -. "$topsrcdir/b2g/config/mozconfigs/common.override" diff --git a/b2g/config/mozconfigs/linux32_gecko/nightly b/b2g/config/mozconfigs/linux32_gecko/nightly index fac17ee24766..22ba1ef76630 100644 --- a/b2g/config/mozconfigs/linux32_gecko/nightly +++ b/b2g/config/mozconfigs/linux32_gecko/nightly @@ -38,5 +38,3 @@ ac_add_options --enable-application=b2g ENABLE_MARIONETTE=1 ac_add_options --disable-elf-hack export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP - -. "$topsrcdir/b2g/config/mozconfigs/common.override" diff --git a/b2g/config/mozconfigs/linux64_gecko/nightly b/b2g/config/mozconfigs/linux64_gecko/nightly index 729392f89654..fd23729b96df 100644 --- a/b2g/config/mozconfigs/linux64_gecko/nightly +++ b/b2g/config/mozconfigs/linux64_gecko/nightly @@ -38,5 +38,3 @@ ac_add_options --enable-application=b2g ENABLE_MARIONETTE=1 ac_add_options --disable-elf-hack export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP - -. "$topsrcdir/b2g/config/mozconfigs/common.override" diff --git a/b2g/config/mozconfigs/macosx64_gecko/nightly b/b2g/config/mozconfigs/macosx64_gecko/nightly index a0e9997b3c5c..348edf231803 100644 --- a/b2g/config/mozconfigs/macosx64_gecko/nightly +++ b/b2g/config/mozconfigs/macosx64_gecko/nightly @@ -26,5 +26,3 @@ ac_add_options --with-ccache ENABLE_MARIONETTE=1 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP - -. "$topsrcdir/b2g/config/mozconfigs/common.override" diff --git a/b2g/config/mozconfigs/win32_gecko/nightly b/b2g/config/mozconfigs/win32_gecko/nightly index 1df3057d3e91..1a2145ab00d6 100644 --- a/b2g/config/mozconfigs/win32_gecko/nightly +++ b/b2g/config/mozconfigs/win32_gecko/nightly @@ -29,5 +29,3 @@ ac_add_options --enable-application=b2g ENABLE_MARIONETTE=1 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP - -. "$topsrcdir/b2g/config/mozconfigs/common.override" diff --git a/browser/config/mozconfigs/linux32/debug b/browser/config/mozconfigs/linux32/debug index 0f8456154aef..289923261d0a 100644 --- a/browser/config/mozconfigs/linux32/debug +++ b/browser/config/mozconfigs/linux32/debug @@ -22,5 +22,3 @@ ac_add_options --enable-warnings-as-errors # Package js shell. export MOZ_PACKAGE_JSSHELL=1 - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux32/debug-asan b/browser/config/mozconfigs/linux32/debug-asan index 204c2621b335..2b786c448f5b 100644 --- a/browser/config/mozconfigs/linux32/debug-asan +++ b/browser/config/mozconfigs/linux32/debug-asan @@ -16,5 +16,3 @@ mk_add_options MOZ_MAKE_FLAGS="-j4" # Package js shell. export MOZ_PACKAGE_JSSHELL=1 - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux32/l10n-mozconfig b/browser/config/mozconfigs/linux32/l10n-mozconfig index 0b216be44508..51bb2ee1f638 100644 --- a/browser/config/mozconfigs/linux32/l10n-mozconfig +++ b/browser/config/mozconfigs/linux32/l10n-mozconfig @@ -5,5 +5,3 @@ ac_add_options --enable-update-packaging . $topsrcdir/build/unix/mozconfig.linux - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux32/nightly b/browser/config/mozconfigs/linux32/nightly index 18b7160a3280..e8e948426e2f 100644 --- a/browser/config/mozconfigs/linux32/nightly +++ b/browser/config/mozconfigs/linux32/nightly @@ -36,5 +36,3 @@ ac_add_options --with-ccache=/usr/bin/ccache # Package js shell. export MOZ_PACKAGE_JSSHELL=1 - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux32/nightly-asan b/browser/config/mozconfigs/linux32/nightly-asan index 1d6037e68c85..3ea16924a6ea 100644 --- a/browser/config/mozconfigs/linux32/nightly-asan +++ b/browser/config/mozconfigs/linux32/nightly-asan @@ -18,5 +18,3 @@ mk_add_options MOZ_MAKE_FLAGS="-j4" # Package js shell. export MOZ_PACKAGE_JSSHELL=1 - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux32/qt b/browser/config/mozconfigs/linux32/qt index 0c46f626ee56..0e36f2d084cb 100644 --- a/browser/config/mozconfigs/linux32/qt +++ b/browser/config/mozconfigs/linux32/qt @@ -26,5 +26,3 @@ ac_add_options --disable-crashreporter # Treat warnings as errors in directories with FAIL_ON_WARNINGS. ac_add_options --enable-warnings-as-errors - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux32/release b/browser/config/mozconfigs/linux32/release index 5927e1cc6046..ebfa65aa17a4 100644 --- a/browser/config/mozconfigs/linux32/release +++ b/browser/config/mozconfigs/linux32/release @@ -24,5 +24,3 @@ mk_add_options MOZ_MAKE_FLAGS="-j4" # Package js shell. export MOZ_PACKAGE_JSSHELL=1 - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux32/rpm b/browser/config/mozconfigs/linux32/rpm index 9016a2204657..67ea4f27b23d 100644 --- a/browser/config/mozconfigs/linux32/rpm +++ b/browser/config/mozconfigs/linux32/rpm @@ -29,5 +29,3 @@ 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 - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux32/valgrind b/browser/config/mozconfigs/linux32/valgrind index 32c0722d231a..b9a11d9ce7c9 100644 --- a/browser/config/mozconfigs/linux32/valgrind +++ b/browser/config/mozconfigs/linux32/valgrind @@ -4,5 +4,3 @@ 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" - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux64/debug b/browser/config/mozconfigs/linux64/debug index d628cb9e2b5d..0ad78c09a13e 100644 --- a/browser/config/mozconfigs/linux64/debug +++ b/browser/config/mozconfigs/linux64/debug @@ -22,5 +22,3 @@ ac_add_options --enable-warnings-as-errors # Package js shell. export MOZ_PACKAGE_JSSHELL=1 - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux64/debug-asan b/browser/config/mozconfigs/linux64/debug-asan index 204c2621b335..2b786c448f5b 100644 --- a/browser/config/mozconfigs/linux64/debug-asan +++ b/browser/config/mozconfigs/linux64/debug-asan @@ -16,5 +16,3 @@ mk_add_options MOZ_MAKE_FLAGS="-j4" # Package js shell. export MOZ_PACKAGE_JSSHELL=1 - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux64/l10n-mozconfig b/browser/config/mozconfigs/linux64/l10n-mozconfig index 0b216be44508..51bb2ee1f638 100644 --- a/browser/config/mozconfigs/linux64/l10n-mozconfig +++ b/browser/config/mozconfigs/linux64/l10n-mozconfig @@ -5,5 +5,3 @@ ac_add_options --enable-update-packaging . $topsrcdir/build/unix/mozconfig.linux - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux64/nightly b/browser/config/mozconfigs/linux64/nightly index 18b7160a3280..e8e948426e2f 100644 --- a/browser/config/mozconfigs/linux64/nightly +++ b/browser/config/mozconfigs/linux64/nightly @@ -36,5 +36,3 @@ ac_add_options --with-ccache=/usr/bin/ccache # Package js shell. export MOZ_PACKAGE_JSSHELL=1 - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux64/nightly-asan b/browser/config/mozconfigs/linux64/nightly-asan index 1d6037e68c85..3ea16924a6ea 100644 --- a/browser/config/mozconfigs/linux64/nightly-asan +++ b/browser/config/mozconfigs/linux64/nightly-asan @@ -18,5 +18,3 @@ mk_add_options MOZ_MAKE_FLAGS="-j4" # Package js shell. export MOZ_PACKAGE_JSSHELL=1 - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux64/release b/browser/config/mozconfigs/linux64/release index 5927e1cc6046..ebfa65aa17a4 100644 --- a/browser/config/mozconfigs/linux64/release +++ b/browser/config/mozconfigs/linux64/release @@ -24,5 +24,3 @@ mk_add_options MOZ_MAKE_FLAGS="-j4" # Package js shell. export MOZ_PACKAGE_JSSHELL=1 - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux64/rpm b/browser/config/mozconfigs/linux64/rpm index 11a24f518559..54cb22262b73 100644 --- a/browser/config/mozconfigs/linux64/rpm +++ b/browser/config/mozconfigs/linux64/rpm @@ -29,5 +29,3 @@ 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 - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux64/valgrind b/browser/config/mozconfigs/linux64/valgrind index a99cb859b086..97be79f60812 100644 --- a/browser/config/mozconfigs/linux64/valgrind +++ b/browser/config/mozconfigs/linux64/valgrind @@ -4,5 +4,3 @@ 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" - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/macosx-universal/nightly b/browser/config/mozconfigs/macosx-universal/nightly index 0869abc52df9..43ed34512f5e 100644 --- a/browser/config/mozconfigs/macosx-universal/nightly +++ b/browser/config/mozconfigs/macosx-universal/nightly @@ -26,5 +26,3 @@ ac_add_options --enable-warnings-as-errors # Package js shell. export MOZ_PACKAGE_JSSHELL=1 - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/macosx-universal/release b/browser/config/mozconfigs/macosx-universal/release index 47e0b185ef80..f8b2c2925e2a 100644 --- a/browser/config/mozconfigs/macosx-universal/release +++ b/browser/config/mozconfigs/macosx-universal/release @@ -20,5 +20,3 @@ mk_add_options MOZ_MAKE_FLAGS="-j4" # Package js shell. export MOZ_PACKAGE_JSSHELL=1 - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/macosx-universal/shark b/browser/config/mozconfigs/macosx-universal/shark index 1132260ef908..48f355dbe1b1 100644 --- a/browser/config/mozconfigs/macosx-universal/shark +++ b/browser/config/mozconfigs/macosx-universal/shark @@ -24,5 +24,3 @@ export MOZ_PKG_SPECIAL="shark" # Treat warnings as errors in directories with FAIL_ON_WARNINGS. ac_add_options --enable-warnings-as-errors ac_add_options --with-ccache - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/macosx32/debug b/browser/config/mozconfigs/macosx32/debug index 1e6fcaa00ab1..f8cbd2d189aa 100644 --- a/browser/config/mozconfigs/macosx32/debug +++ b/browser/config/mozconfigs/macosx32/debug @@ -15,5 +15,3 @@ ac_add_options --with-macbundlename-prefix=Firefox # Package js shell. export MOZ_PACKAGE_JSSHELL=1 - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/macosx64/debug b/browser/config/mozconfigs/macosx64/debug index 479b371d041b..e4d015b8a74c 100644 --- a/browser/config/mozconfigs/macosx64/debug +++ b/browser/config/mozconfigs/macosx64/debug @@ -19,5 +19,3 @@ ac_add_options --enable-warnings-as-errors # Package js shell. export MOZ_PACKAGE_JSSHELL=1 - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/macosx64/debug-asan b/browser/config/mozconfigs/macosx64/debug-asan index c9d12ff5d839..1ffc882d4dda 100644 --- a/browser/config/mozconfigs/macosx64/debug-asan +++ b/browser/config/mozconfigs/macosx64/debug-asan @@ -12,5 +12,3 @@ mk_add_options MOZ_MAKE_FLAGS="-j12" export MOZ_PACKAGE_JSSHELL=1 ac_add_options --with-macbundlename-prefix=Firefox - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/macosx64/l10n-mozconfig b/browser/config/mozconfigs/macosx64/l10n-mozconfig index 1a2fa3b3fc5d..e9b68e1b2979 100644 --- a/browser/config/mozconfigs/macosx64/l10n-mozconfig +++ b/browser/config/mozconfigs/macosx64/l10n-mozconfig @@ -5,5 +5,3 @@ ac_add_options --enable-official-branding 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/browser/config/mozconfigs/win32/debug b/browser/config/mozconfigs/win32/debug index 195b5232a4e0..3ddbc441d711 100644 --- a/browser/config/mozconfigs/win32/debug +++ b/browser/config/mozconfigs/win32/debug @@ -22,5 +22,3 @@ fi # Package js shell. export MOZ_PACKAGE_JSSHELL=1 - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/win32/l10n-mozconfig b/browser/config/mozconfigs/win32/l10n-mozconfig index 9af0999e73f2..5ac1722dddbc 100644 --- a/browser/config/mozconfigs/win32/l10n-mozconfig +++ b/browser/config/mozconfigs/win32/l10n-mozconfig @@ -10,5 +10,3 @@ if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD6 else . $topsrcdir/build/win32/mozconfig.vs2010 fi - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/win32/nightly b/browser/config/mozconfigs/win32/nightly index ceca298368c0..1d2c9683b6d7 100644 --- a/browser/config/mozconfigs/win32/nightly +++ b/browser/config/mozconfigs/win32/nightly @@ -31,5 +31,3 @@ fi # Package js shell. export MOZ_PACKAGE_JSSHELL=1 - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/win32/release b/browser/config/mozconfigs/win32/release index ef29efc27082..53f1f91fb373 100644 --- a/browser/config/mozconfigs/win32/release +++ b/browser/config/mozconfigs/win32/release @@ -28,5 +28,3 @@ fi # Package js shell. export MOZ_PACKAGE_JSSHELL=1 - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/win64/debug b/browser/config/mozconfigs/win64/debug index c22830b82e6e..444adfcd2f61 100644 --- a/browser/config/mozconfigs/win64/debug +++ b/browser/config/mozconfigs/win64/debug @@ -15,5 +15,3 @@ mk_add_options MOZ_MAKE_FLAGS=-j1 export MOZ_PACKAGE_JSSHELL=1 . $topsrcdir/build/win64/mozconfig.vs2010 - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/win64/nightly b/browser/config/mozconfigs/win64/nightly index 5e77d12cfaa4..de6ab34ce6de 100644 --- a/browser/config/mozconfigs/win64/nightly +++ b/browser/config/mozconfigs/win64/nightly @@ -24,5 +24,3 @@ mk_add_options MOZ_MAKE_FLAGS=-j1 export MOZ_PACKAGE_JSSHELL=1 . $topsrcdir/build/win64/mozconfig.vs2010 - -. "$topsrcdir/build/mozconfig.common.override"