Port part of bug 738612 - Restore mozconfig-extra (Try) feature, or similar. r=bustage-fix to fix check-sync-dirs bustage

--HG--
rename : build/macosx/common => build/macosx/mozconfig.common

build/macosx/mozconfig.common

@@ -1,3 +1,9 @@
+# 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

build/macosx/mozconfig.leopard

@@ -1,6 +1,6 @@
-. $topsrcdir/build/macosx/common
+. $topsrcdir/build/macosx/mozconfig.common
 
-# Mac builds don't nomally have to be handled as cross
+# Mac builds don't normally have to be handled as cross
 # compilation, but some of the libraries on the bots
 # (IDL for example) are built only for one arch.
 

build/macosx/universal/mozconfig.common

@@ -12,7 +12,7 @@ ac_add_app_options x86_64 --target=x86_64-apple-darwin10
 
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.6.sdk
 
-. $topsrcdir/build/macosx/common
+. $topsrcdir/build/macosx/mozconfig.common
 
 # $MOZ_BUILD_APP is only defined when sourced by configure.  That's not a
 # problem, because the variables it affects only need to be set for

build/mozconfig.common

@@ -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 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.

build/unix/mozconfig.linux

@@ -1,2 +1,4 @@
+. "$topsrcdir/build/mozconfig.common"
+
 CC=/tools/gcc-4.5-0moz3/bin/gcc
 CXX=/tools/gcc-4.5-0moz3/bin/g++

mail/config/mozconfigs/macosx64/debug

@@ -1,4 +1,4 @@
-. $topsrcdir/build/macosx/common
+. $topsrcdir/build/macosx/mozconfig.common
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-debug

mail/config/mozconfigs/win32/debug

@@ -1,3 +1,5 @@
+. "$topsrcdir/build/mozconfig.common"
+
 ac_add_options --enable-application=mail
 ac_add_options --enable-debug
 ac_add_options --enable-trace-malloc

mail/config/mozconfigs/win32/nightly

@@ -1,3 +1,5 @@
+. "$topsrcdir/build/mozconfig.common"
+
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging

mail/config/mozconfigs/win32/release

@@ -1,3 +1,5 @@
+. "$topsrcdir/build/mozconfig.common"
+
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging

mail/config/mozconfigs/win64/debug

@@ -1,3 +1,5 @@
+. "$topsrcdir/build/mozconfig.common"
+
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 

mail/config/mozconfigs/win64/nightly

@@ -1,3 +1,5 @@
+. "$topsrcdir/build/mozconfig.common"
+
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32