Bug 738612 - Add mozconfig "override" files to be included after everything else, for overriding previously set options. r=ted

--HG--
extra : rebase_source : e2062258eb508541bf499a5e4bc7d7e1ead10a00

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 by all b2g mozconfigs
+# This file is included at the top of all b2g mozconfigs
 
 . "$topsrcdir/build/mozconfig.common"

b2g/config/mozconfigs/common.override

@@ -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 at the bottom of all b2g mozconfigs
+
+. "$topsrcdir/build/mozconfig.common.override"

b2g/config/mozconfigs/gb_armv7a_gecko/debug

@@ -17,3 +17,5 @@ ENABLE_MARIONETTE=1
 
 # Enable dump() from JS.
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
+
+. "$topsrcdir/b2g/config/mozconfigs/common.override"

b2g/config/mozconfigs/gb_armv7a_gecko/nightly

@@ -17,3 +17,5 @@ ENABLE_MARIONETTE=1
 
 # Enable dump() from JS.
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
+
+. "$topsrcdir/b2g/config/mozconfigs/common.override"

b2g/config/mozconfigs/ics_armv7a_gecko/debug

@@ -18,3 +18,5 @@ 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"

b2g/config/mozconfigs/ics_armv7a_gecko/nightly

@@ -20,3 +20,5 @@ 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"

b2g/config/mozconfigs/linux32_gecko/nightly

@@ -38,3 +38,5 @@ 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"

b2g/config/mozconfigs/linux64_gecko/nightly

@@ -38,3 +38,5 @@ 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"

b2g/config/mozconfigs/macosx64_gecko/nightly

@@ -26,3 +26,5 @@ ac_add_options --with-ccache
 ENABLE_MARIONETTE=1
 
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
+
+. "$topsrcdir/b2g/config/mozconfigs/common.override"

b2g/config/mozconfigs/win32_gecko/nightly

@@ -29,3 +29,5 @@ ac_add_options --enable-application=b2g
 ENABLE_MARIONETTE=1
 
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
+
+. "$topsrcdir/b2g/config/mozconfigs/common.override"

browser/config/mozconfigs/linux32/debug

@@ -22,3 +22,5 @@ ac_add_options --enable-warnings-as-errors
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
+
+. "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/linux32/debug-asan

@@ -16,3 +16,5 @@ mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
+
+. "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/linux32/l10n-mozconfig

@@ -5,3 +5,5 @@ ac_add_options --enable-update-packaging
 
 . $topsrcdir/build/unix/mozconfig.linux
 
+
+. "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/linux32/nightly

@@ -36,3 +36,5 @@ ac_add_options --with-ccache=/usr/bin/ccache
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
+
+. "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/linux32/nightly-asan

@@ -18,3 +18,5 @@ mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
+
+. "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/linux32/qt

@@ -26,3 +26,5 @@ 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"

browser/config/mozconfigs/linux32/release

@@ -24,3 +24,5 @@ mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
+
+. "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/linux32/rpm

@@ -29,3 +29,5 @@ 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"

browser/config/mozconfigs/linux64/debug

@@ -22,3 +22,5 @@ ac_add_options --enable-warnings-as-errors
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
+
+. "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/linux64/debug-asan

@@ -16,3 +16,5 @@ mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
+
+. "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/linux64/l10n-mozconfig

@@ -5,3 +5,5 @@ ac_add_options --enable-update-packaging
 
 . $topsrcdir/build/unix/mozconfig.linux
 
+
+. "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/linux64/nightly

@@ -36,3 +36,5 @@ ac_add_options --with-ccache=/usr/bin/ccache
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
+
+. "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/linux64/nightly-asan

@@ -18,3 +18,5 @@ mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
+
+. "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/linux64/release

@@ -24,3 +24,5 @@ mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
+
+. "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/linux64/rpm

@@ -29,3 +29,5 @@ 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"

browser/config/mozconfigs/macosx-universal/nightly

@@ -26,3 +26,5 @@ ac_add_options --enable-warnings-as-errors
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
+
+. "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/macosx-universal/release

@@ -20,3 +20,5 @@ mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
+
+. "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/macosx-universal/shark

@@ -24,3 +24,5 @@ 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"

browser/config/mozconfigs/macosx32/debug

@@ -15,3 +15,5 @@ ac_add_options --with-macbundlename-prefix=Firefox
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
+
+. "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/macosx64/debug

@@ -19,3 +19,5 @@ ac_add_options --enable-warnings-as-errors
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
+
+. "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/macosx64/debug-asan

@@ -12,3 +12,5 @@ mk_add_options MOZ_MAKE_FLAGS="-j12"
 export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-macbundlename-prefix=Firefox
+
+. "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/macosx64/l10n-mozconfig

@@ -5,3 +5,5 @@ 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"

browser/config/mozconfigs/win32/debug

@@ -22,3 +22,5 @@ fi
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
+
+. "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/win32/l10n-mozconfig

@@ -10,3 +10,5 @@ if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD6
 else
   . $topsrcdir/build/win32/mozconfig.vs2010
 fi
+
+. "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/win32/nightly

@@ -31,3 +31,5 @@ fi
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
+
+. "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/win32/release

@@ -28,3 +28,5 @@ fi
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
+
+. "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/win64/debug

@@ -15,3 +15,5 @@ mk_add_options MOZ_MAKE_FLAGS=-j1
 export MOZ_PACKAGE_JSSHELL=1
 
 . $topsrcdir/build/win64/mozconfig.vs2010
+
+. "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/win64/nightly

@@ -24,3 +24,5 @@ mk_add_options MOZ_MAKE_FLAGS=-j1
 export MOZ_PACKAGE_JSSHELL=1
 
 . $topsrcdir/build/win64/mozconfig.vs2010
+
+. "$topsrcdir/build/mozconfig.common.override"

build/mozconfig.common

@@ -6,4 +6,6 @@
 #
 # 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.
+# 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.

build/mozconfig.common.override

@@ -0,0 +1,11 @@
+# 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.

mobile/android/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 by all native android mozconfigs
+# This file is included at the top of all native android mozconfigs
 
 . "$topsrcdir/build/mozconfig.common"

mobile/android/config/mozconfigs/common.override

@@ -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 at the bottom of all native android mozconfigs
+
+. "$topsrcdir/build/mozconfig.common.override"

mobile/xul/config/mozconfigs/android/common

@@ -1 +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 at the top of all Android XUL mozconfigs
+
 . "$topsrcdir/build/mozconfig.common"

mobile/xul/config/mozconfigs/android/common.override

@@ -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 at the bottom of all Android XUL mozconfigs
+
+. "$topsrcdir/build/mozconfig.common.override"

mobile/xul/config/mozconfigs/android/debug

@@ -22,3 +22,5 @@ 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"

mobile/xul/config/mozconfigs/android/nightly

@@ -25,3 +25,5 @@ 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"

mobile/xul/config/mozconfigs/android/release

@@ -21,3 +21,5 @@ 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"

xulrunner/config/mozconfigs/common

@@ -1 +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 at the top of all xulrunner mozconfigs
+
 . "$topsrcdir/build/mozconfig.common"

xulrunner/config/mozconfigs/common.override

@@ -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 at the bottom of all xulrunner mozconfigs
+
+. "$topsrcdir/build/mozconfig.common.override"

xulrunner/config/mozconfigs/linux32/xulrunner

@@ -14,3 +14,5 @@ mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
+
+. "$topsrcdir/xulrunner/config/mozconfigs/common.override"

xulrunner/config/mozconfigs/linux32/xulrunner-qt

@@ -20,3 +20,5 @@ 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"

xulrunner/config/mozconfigs/linux64/xulrunner

@@ -14,3 +14,5 @@ mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
+
+. "$topsrcdir/xulrunner/config/mozconfigs/common.override"

xulrunner/config/mozconfigs/macosx-universal/xulrunner

@@ -7,3 +7,5 @@ ac_add_options --disable-tests
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
+
+. "$topsrcdir/xulrunner/config/mozconfigs/common.override"

xulrunner/config/mozconfigs/win32/xulrunner

@@ -14,3 +14,5 @@ if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD6
 else
   . $topsrcdir/build/win32/mozconfig.vs2010
 fi
+
+. "$topsrcdir/xulrunner/config/mozconfigs/common.override"

xulrunner/config/mozconfigs/win64/xulrunner

@@ -11,3 +11,5 @@ ac_add_options --enable-jemalloc
 ac_add_options --disable-tests
 
 mk_add_options MOZ_MAKE_FLAGS=-j1
+
+. "$topsrcdir/xulrunner/config/mozconfigs/common.override"