Bug 1183328 - port bug 1181040 (Include mozconfig.cache after mozconfig.common.override) to thunderbird. r=? draft
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Mon, 13 Jul 2015 23:43:16 +0300
changeset 30042 8dfd0f6ec2c5f845d276ed60039e650479ab0e09
parent 30041 a22d99bf93b7fb526789c729c11b8a294a719bd3
child 30043 a793d78d8274b97d05313e265a6975d18567ce29
push id2453
push usermkmelin@iki.fi
push dateMon, 13 Jul 2015 20:44:33 +0000
treeherdertry-comm-central@a793d78d8274 [default view] [failures only]
bugs1183328, 1181040, 0
Bug 1183328 - port bug 1181040 (Include mozconfig.cache after mozconfig.common.override) to thunderbird. r=? 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
build/mozconfig.cache
mail/config/mozconfigs/linux32/debug
mail/config/mozconfigs/linux32/l10n-mozconfig
mail/config/mozconfigs/linux32/nightly
mail/config/mozconfigs/linux64/debug
mail/config/mozconfigs/linux64/l10n-mozconfig
mail/config/mozconfigs/linux64/nightly
--- a/build/macosx/mozconfig.common
+++ b/build/macosx/mozconfig.common
@@ -29,11 +29,9 @@ if [ -z "$CC" ]; then
     export CC=clang
 fi
 
 # If not set use the system default clang++
 if [ -z "$CXX" ]; then
     export CXX=clang++
 fi
 
-. "$topsrcdir/build/mozconfig.cache"
-
 export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
--- a/build/mozconfig.cache
+++ b/build/mozconfig.cache
@@ -46,16 +46,20 @@ fi
 
 if test -z "$bucket"; then
     case "$platform" in
     win*) : ;;
     *)
         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*)
         mk_add_options "export SCCACHE_NAMESERVER=169.254.169.253"
         ;;
     esac
     ac_add_options "--with-compiler-wrapper=python2.7 $topsrcdir/sccache/sccache.py"
     mk_add_options MOZ_PREFLIGHT_ALL+=build/sccache.mk
--- a/mail/config/mozconfigs/linux32/debug
+++ b/mail/config/mozconfigs/linux32/debug
@@ -10,14 +10,13 @@ ac_add_options --enable-calendar
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 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"
--- a/mail/config/mozconfigs/linux32/l10n-mozconfig
+++ b/mail/config/mozconfigs/linux32/l10n-mozconfig
@@ -10,16 +10,15 @@ ac_add_options --with-l10n-base=../../l1
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 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"
--- a/mail/config/mozconfigs/linux32/nightly
+++ b/mail/config/mozconfigs/linux32/nightly
@@ -15,14 +15,13 @@ export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
 # For NSS symbols
 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"
--- a/mail/config/mozconfigs/linux64/debug
+++ b/mail/config/mozconfigs/linux64/debug
@@ -10,14 +10,13 @@ ac_add_options --enable-calendar
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 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"
--- a/mail/config/mozconfigs/linux64/l10n-mozconfig
+++ b/mail/config/mozconfigs/linux64/l10n-mozconfig
@@ -10,16 +10,13 @@ ac_add_options --with-l10n-base=../../l1
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 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
--- a/mail/config/mozconfigs/linux64/nightly
+++ b/mail/config/mozconfigs/linux64/nightly
@@ -15,14 +15,13 @@ export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
 # For NSS symbols
 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"