Bug 1183328 - port bug 1181040 (Include mozconfig.cache after mozconfig.common.override) to thunderbird. r=jcranmer, a=mkmelin

DONTBUILD
CLOSED TREE

python mail/check-sync-dirs.py build mozilla/build/
 now passes!


TEST-UNEXPECTED-FAIL | check-sync-dirs.py | build file copies are not in sync
TEST-INFO | check-sync-dirs.py | file(s) found in:               /builds/slave/tb-c-cen-l64-ntly-000000000000/build/build
TEST-INFO | check-sync-dirs.py | differ from their originals in: /builds/slave/tb-c-cen-l64-ntly-000000000000/build/mozilla/build
TEST-INFO | check-sync-dirs.py | differing file:                 ./mozconfig.cache
TEST-INFO | check-sync-dirs.py | differing file:                 ./macosx/mozconfig.common

build/macosx/mozconfig.common

@@ -34,6 +34,4 @@ if [ -z "$CXX" ]; then
     export CXX=clang++
 fi
 
-. "$topsrcdir/build/mozconfig.cache"
-
 export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token

build/mozconfig.cache

@@ -51,6 +51,10 @@ if test -z "$bucket"; then
         ac_add_options --with-ccache
     esac
 else
+    if ! test -e $topsrcdir/sccache/sccache.py; then
+        echo "Sccache missing in the tooltool manifest" >&2
+        exit 1
+    fi
     mk_add_options "export SCCACHE_BUCKET=$bucket"
     case "$master" in
     *use1.mozilla.com*|*usw2.mozilla.com*)

mail/config/mozconfigs/linux32/debug

@@ -15,9 +15,8 @@ export MOZ_DEBUG_SYMBOLS=1
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
+
+. "$topsrcdir/build/mozconfig.cache"

mail/config/mozconfigs/linux32/l10n-mozconfig

@@ -15,11 +15,10 @@ export MOZILLA_OFFICIAL=1
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
-# Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
 ac_add_options --disable-stdcxx-compat
 
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-l10n-args ] && cat $topsrcdir/build/client.py-l10n-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
+
+. "$topsrcdir/build/mozconfig.cache"

mail/config/mozconfigs/linux32/nightly

@@ -20,9 +20,8 @@ export MOZ_DEBUG_SYMBOLS=1
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
-# Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
+
+. "$topsrcdir/build/mozconfig.cache"

mail/config/mozconfigs/linux64/debug

@@ -15,9 +15,8 @@ export MOZ_DEBUG_SYMBOLS=1
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
-# Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
+
+. "$topsrcdir/build/mozconfig.cache"

mail/config/mozconfigs/linux64/l10n-mozconfig

@@ -15,9 +15,6 @@ export MOZILLA_OFFICIAL=1
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
-# Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
 ac_add_options --disable-stdcxx-compat
 
 # Run client.py

mail/config/mozconfigs/linux64/nightly

@@ -20,9 +20,8 @@ export MOZ_DEBUG_SYMBOLS=1
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
-# Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
+
+. "$topsrcdir/build/mozconfig.cache"