Backed out changeset 81bbb0b8aff2 (bug 738612)

2012-09-04 16:01:23 -07:00 · 2012-09-04 16:01:23 -07:00 · 4bbcffd151
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"