Backout bug 738612, with feeling this time.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 04 Sep 2012 19:21:23 -0400
changeset 104229 4cd45f6cce87795420a673a30fcdcc317fd899ce
parent 104228 20adcf83fc42ffdb03eb81bb5547d76482ae03f7
child 104230 6bb37077d6153cb532929b6b58271471d431a60a
push id14411
push userryanvm@gmail.com
push dateTue, 04 Sep 2012 23:21:49 +0000
treeherdermozilla-inbound@4cd45f6cce87 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs738612
milestone18.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout bug 738612, with feeling this time.
b2g/config/mozconfigs/common
b2g/config/mozconfigs/common.override
browser/config/mozconfigs/common
build/macosx/common
build/macosx/mozconfig.common
build/macosx/mozconfig.leopard
build/mozconfig.common
build/mozconfig.common.override
build/unix/mozconfig.linux
mobile/android/config/mozconfigs/android-armv6/debug
mobile/android/config/mozconfigs/android-armv6/l10n-nightly
mobile/android/config/mozconfigs/android-armv6/l10n-release
mobile/android/config/mozconfigs/android-armv6/nightly
mobile/android/config/mozconfigs/android-armv6/release
mobile/android/config/mozconfigs/android-x86/debug
mobile/android/config/mozconfigs/android-x86/l10n-nightly
mobile/android/config/mozconfigs/android-x86/l10n-release
mobile/android/config/mozconfigs/android-x86/nightly
mobile/android/config/mozconfigs/android-x86/release
mobile/android/config/mozconfigs/android/debug
mobile/android/config/mozconfigs/android/l10n-nightly
mobile/android/config/mozconfigs/android/l10n-release
mobile/android/config/mozconfigs/android/nightly
mobile/android/config/mozconfigs/android/release
mobile/android/config/mozconfigs/common
mobile/android/config/mozconfigs/common.override
mobile/xul/config/mozconfigs/android/common
mobile/xul/config/mozconfigs/android/common.override
mobile/xul/config/mozconfigs/android/debug
mobile/xul/config/mozconfigs/android/nightly
mobile/xul/config/mozconfigs/android/release
xulrunner/config/mozconfigs/common
xulrunner/config/mozconfigs/common.override
xulrunner/config/mozconfigs/linux32/xulrunner
xulrunner/config/mozconfigs/linux32/xulrunner-qt
xulrunner/config/mozconfigs/linux64/xulrunner
xulrunner/config/mozconfigs/macosx-universal/xulrunner
xulrunner/config/mozconfigs/win32/xulrunner
xulrunner/config/mozconfigs/win64/xulrunner
deleted file mode 100644
--- a/b2g/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 b2g mozconfigs
-
-. "$topsrcdir/build/mozconfig.common"
deleted file mode 100644
--- a/b2g/config/mozconfigs/common.override
+++ /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 at the bottom of all b2g mozconfigs
-
-. "$topsrcdir/build/mozconfig.common.override"
deleted file mode 100644
--- a/browser/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"
new file mode 100644
--- /dev/null
+++ b/build/macosx/common
@@ -0,0 +1,12 @@
+if [ -d "$topsrcdir/clang" ]; then
+    # mozilla-central based build
+    export CC=$topsrcdir/clang/bin/clang
+    export CXX=$topsrcdir/clang/bin/clang++
+elif [ -d "$topsrcdir/../clang" ]; then
+    # comm-central based build
+    export CC=$topsrcdir/../clang/bin/clang
+    export CXX=$topsrcdir/../clang/bin/clang++
+fi
+
+ac_add_options --enable-stdcxx-compat
+ac_add_options --with-ccache
deleted file mode 100644
--- a/build/macosx/mozconfig.common
+++ /dev/null
@@ -1,18 +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/.
-
-. "$topsrcdir/build/mozconfig.common"
-
-if [ -d "$topsrcdir/clang" ]; then
-    # mozilla-central based build
-    export CC=$topsrcdir/clang/bin/clang
-    export CXX=$topsrcdir/clang/bin/clang++
-elif [ -d "$topsrcdir/../clang" ]; then
-    # comm-central based build
-    export CC=$topsrcdir/../clang/bin/clang
-    export CXX=$topsrcdir/../clang/bin/clang++
-fi
-
-ac_add_options --enable-stdcxx-compat
-ac_add_options --with-ccache
--- a/build/macosx/mozconfig.leopard
+++ b/build/macosx/mozconfig.leopard
@@ -1,11 +1,11 @@
 . $topsrcdir/build/macosx/common
 
-# Mac builds don't normally have to be handled as cross
+# Mac builds don't nomally have to be handled as cross
 # compilation, but some of the libraries on the bots
 # (IDL for example) are built only for one arch.
 
 HOST_CC=$CC
 HOST_CXX=$CXX
 
 # These must be set for cross builds, and don't hurt straight builds.
 RANLIB=ranlib
deleted file mode 100644
--- a/build/mozconfig.common
+++ /dev/null
@@ -1,11 +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/.
-
-# Common mozconfig for all users
-#
-# Add options to this file that will be inherited by all in-tree mozconfigs.
-# This is useful for eg try builds with nondefault options that apply to all
-# architectures, though note that if you want to override options set in
-# another mozconfig file, you'll need to use mozconfig.common.override instead
-# of this file.
deleted file mode 100644
--- a/build/mozconfig.common.override
+++ /dev/null
@@ -1,11 +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/.
-
-# Common mozconfig for all users
-#
-# Add options to this file that will be inherited by all in-tree mozconfigs.
-# This file is included at the *end* of the mozconfigs, and so may be used
-# to override anything done previously.
-#
-# The common expected usage is for try builds with nondefault options.
--- a/build/unix/mozconfig.linux
+++ b/build/unix/mozconfig.linux
@@ -1,4 +1,2 @@
-. "$topsrcdir/build/mozconfig.common"
-
 CC=/tools/gcc-4.5-0moz3/bin/gcc
 CXX=/tools/gcc-4.5-0moz3/bin/g++
--- a/mobile/android/config/mozconfigs/android-armv6/debug
+++ b/mobile/android/config/mozconfigs/android-armv6/debug
@@ -1,10 +1,8 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --enable-debug
 
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 
 # Android
--- a/mobile/android/config/mozconfigs/android-armv6/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-armv6/l10n-nightly
@@ -1,10 +1,8 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
 # L10n
 ac_add_options --with-l10n-base=../../l10n-central
 
 # Global options
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 ac_add_options --disable-tests
 
 # Mozilla-Central nightlies only since this has a cost in performance
--- a/mobile/android/config/mozconfigs/android-armv6/l10n-release
+++ b/mobile/android/config/mozconfigs/android-armv6/l10n-release
@@ -1,10 +1,8 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
 # L10n
 ac_add_options --with-l10n-base=..
 
 # Global options
 ac_add_options --disable-tests
 
 # Build Fennec
 ac_add_options --enable-application=mobile/android
--- a/mobile/android/config/mozconfigs/android-armv6/nightly
+++ b/mobile/android/config/mozconfigs/android-armv6/nightly
@@ -1,10 +1,8 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
 # Global options
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
--- a/mobile/android/config/mozconfigs/android-armv6/release
+++ b/mobile/android/config/mozconfigs/android-armv6/release
@@ -1,10 +1,8 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
 # Global options
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
--- a/mobile/android/config/mozconfigs/android-x86/debug
+++ b/mobile/android/config/mozconfigs/android-x86/debug
@@ -1,10 +1,8 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --enable-debug
 
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 
 # Android
--- a/mobile/android/config/mozconfigs/android-x86/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-x86/l10n-nightly
@@ -1,10 +1,8 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
 # L10n
 ac_add_options --with-l10n-base=../../l10n-central
 
 # Global options
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 ac_add_options --disable-tests
 
 # Mozilla-Central nightlies only since this has a cost in performance
--- a/mobile/android/config/mozconfigs/android-x86/l10n-release
+++ b/mobile/android/config/mozconfigs/android-x86/l10n-release
@@ -1,10 +1,8 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
 # L10n
 ac_add_options --with-l10n-base=..
 
 # Global options
 ac_add_options --disable-tests
 
 # Build Fennec
 ac_add_options --enable-application=mobile/android
--- a/mobile/android/config/mozconfigs/android-x86/nightly
+++ b/mobile/android/config/mozconfigs/android-x86/nightly
@@ -1,10 +1,8 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
 # Global options
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=i386-linux-android
--- a/mobile/android/config/mozconfigs/android-x86/release
+++ b/mobile/android/config/mozconfigs/android-x86/release
@@ -1,10 +1,8 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
 # Global options
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=i386-linux-android
--- a/mobile/android/config/mozconfigs/android/debug
+++ b/mobile/android/config/mozconfigs/android/debug
@@ -1,10 +1,8 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --enable-debug
 
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 
 # Android
--- a/mobile/android/config/mozconfigs/android/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android/l10n-nightly
@@ -1,10 +1,8 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
 # L10n
 ac_add_options --with-l10n-base=../../l10n-central
 
 # Global options
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 ac_add_options --disable-tests
 
 # Mozilla-Central nightlies only since this has a cost in performance
--- a/mobile/android/config/mozconfigs/android/l10n-release
+++ b/mobile/android/config/mozconfigs/android/l10n-release
@@ -1,10 +1,8 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
 # L10n
 ac_add_options --with-l10n-base=..
 
 # Global options
 ac_add_options --disable-tests
 
 # Build Fennec
 ac_add_options --enable-application=mobile/android
--- a/mobile/android/config/mozconfigs/android/nightly
+++ b/mobile/android/config/mozconfigs/android/nightly
@@ -1,10 +1,8 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
 # Global options
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
--- a/mobile/android/config/mozconfigs/android/release
+++ b/mobile/android/config/mozconfigs/android/release
@@ -1,10 +1,8 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
 # Global options
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
deleted file mode 100644
--- a/mobile/android/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 at the top of all native android mozconfigs
-
-. "$topsrcdir/build/mozconfig.common"
deleted file mode 100644
--- a/mobile/android/config/mozconfigs/common.override
+++ /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 at the bottom of all native android mozconfigs
-
-. "$topsrcdir/build/mozconfig.common.override"
deleted file mode 100644
--- a/mobile/xul/config/mozconfigs/android/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 at the top of all Android XUL mozconfigs
-
-. "$topsrcdir/build/mozconfig.common"
deleted file mode 100644
--- a/mobile/xul/config/mozconfigs/android/common.override
+++ /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 at the bottom of all Android XUL mozconfigs
-
-. "$topsrcdir/build/mozconfig.common.override"
--- a/mobile/xul/config/mozconfigs/android/debug
+++ b/mobile/xul/config/mozconfigs/android/debug
@@ -1,10 +1,8 @@
-. "$topsrcdir/mobile/xul/config/mozconfigs/android/common"
-
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --enable-debug
 
 # Build Fennec
 ac_add_options --enable-application=mobile
 
 # Android
@@ -17,10 +15,8 @@ ac_add_options --with-system-zlib
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
 ac_add_options --with-branding=mobile/xul/branding/nightly
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
-
-. "$topsrcdir/mobile/xul/config/mozconfigs/android/common.override"
--- a/mobile/xul/config/mozconfigs/android/nightly
+++ b/mobile/xul/config/mozconfigs/android/nightly
@@ -1,10 +1,8 @@
-. "$topsrcdir/mobile/xul/config/mozconfigs/android/common"
-
 # Global options
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
 # Build Fennec
 ac_add_options --enable-application=mobile
@@ -20,10 +18,8 @@ ac_add_options --enable-update-channel=$
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
 ac_add_options --with-branding=mobile/xul/branding/nightly
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
-
-. "$topsrcdir/mobile/xul/config/mozconfigs/android/common.override"
--- a/mobile/xul/config/mozconfigs/android/release
+++ b/mobile/xul/config/mozconfigs/android/release
@@ -1,10 +1,8 @@
-. "$topsrcdir/mobile/xul/config/mozconfigs/android/common"
-
 # Global options
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 # Build Fennec
 ac_add_options --enable-application=mobile/xul
 
 # Android
 ac_add_options --target=arm-linux-androideabi
@@ -16,10 +14,8 @@ ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
 ac_add_options --enable-official-branding
 ac_add_options --with-branding=mobile/xul/branding/beta
-
-. "$topsrcdir/mobile/xul/config/mozconfigs/android/common.override"
deleted file mode 100644
--- a/xulrunner/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 at the top of all xulrunner mozconfigs
-
-. "$topsrcdir/build/mozconfig.common"
deleted file mode 100644
--- a/xulrunner/config/mozconfigs/common.override
+++ /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 at the bottom of all xulrunner mozconfigs
-
-. "$topsrcdir/build/mozconfig.common.override"
--- a/xulrunner/config/mozconfigs/linux32/xulrunner
+++ b/xulrunner/config/mozconfigs/linux32/xulrunner
@@ -9,10 +9,8 @@ ac_add_options --disable-tests
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
-
-. "$topsrcdir/xulrunner/config/mozconfigs/common.override"
--- a/xulrunner/config/mozconfigs/linux32/xulrunner-qt
+++ b/xulrunner/config/mozconfigs/linux32/xulrunner-qt
@@ -15,10 +15,8 @@ mk_add_options MOZ_MAKE_FLAGS="-j4"
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
 # QT Options
 export PKG_CONFIG_PATH=/tools/qt-4.6.3/qt/lib/pkgconfig
 ac_add_options --with-qtdir=/tools/qt-4.6.3/qt
 ac_add_options --enable-default-toolkit=cairo-qt
 ac_add_options --disable-crashreporter
-
-. "$topsrcdir/xulrunner/config/mozconfigs/common.override"
--- a/xulrunner/config/mozconfigs/linux64/xulrunner
+++ b/xulrunner/config/mozconfigs/linux64/xulrunner
@@ -9,10 +9,8 @@ ac_add_options --disable-tests
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
-
-. "$topsrcdir/xulrunner/config/mozconfigs/common.override"
--- a/xulrunner/config/mozconfigs/macosx-universal/xulrunner
+++ b/xulrunner/config/mozconfigs/macosx-universal/xulrunner
@@ -2,10 +2,8 @@
 
 export MOZILLA_OFFICIAL=1
 
 ac_add_options --enable-application=xulrunner
 ac_add_options --disable-tests
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-. "$topsrcdir/xulrunner/config/mozconfigs/common.override"
--- a/xulrunner/config/mozconfigs/win32/xulrunner
+++ b/xulrunner/config/mozconfigs/win32/xulrunner
@@ -1,18 +1,14 @@
-. "$topsrcdir/xulrunner/config/mozconfigs/common"
-
 export MOZILLA_OFFICIAL=1
 export JAVA_HOME=/d/jdk1.6.0_14
 
 ac_add_options --enable-application=xulrunner
 ac_add_options --enable-jemalloc
 ac_add_options --disable-tests
 
 mk_add_options MOZ_MAKE_FLAGS=-j1
 
 if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
   . $topsrcdir/build/win32/mozconfig.vs2010-win64
 else
   . $topsrcdir/build/win32/mozconfig.vs2010
 fi
-
-. "$topsrcdir/xulrunner/config/mozconfigs/common.override"
--- a/xulrunner/config/mozconfigs/win64/xulrunner
+++ b/xulrunner/config/mozconfigs/win64/xulrunner
@@ -1,15 +1,11 @@
-. "$topsrcdir/xulrunner/config/mozconfigs/common"
-
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 export MOZILLA_OFFICIAL=1
 export JAVA_HOME=/d/jdk1.6.0_14
 
 ac_add_options --enable-application=xulrunner
 ac_add_options --enable-jemalloc
 ac_add_options --disable-tests
 
 mk_add_options MOZ_MAKE_FLAGS=-j1
-
-. "$topsrcdir/xulrunner/config/mozconfigs/common.override"