Bug 1181040 - Include mozconfig.cache after mozconfig.common.override…

…. r=mshal Enable sccache on windows b2g builds at the same time to simplify things.
dothq · Jul 10, 2015 · 8487877 · 8487877
1 parent 027fd93
commit 8487877
Show file tree

Hide file tree

Showing 33 changed files with 31 additions and 39 deletions.
diff --git a/b2g/config/mozconfigs/common.override b/b2g/config/mozconfigs/common.override
@@ -5,3 +5,4 @@
 # This file is included at the bottom of all b2g mozconfigs
 
 . "$topsrcdir/build/mozconfig.common.override"
+. "$topsrcdir/build/mozconfig.cache"
diff --git a/b2g/config/mozconfigs/ics_armv7a_gecko/debug b/b2g/config/mozconfigs/ics_armv7a_gecko/debug
@@ -12,7 +12,6 @@ export GONK_PRODUCT=generic
 ac_add_options --with-gonk-toolchain-prefix="$topsrcdir/gonk-toolchain/prebuilt/$TOOLCHAIN_HOST/toolchain/arm-linux-androideabi-4.4.x/bin/arm-linux-androideabi-"
 ac_add_options --enable-debug-symbols
 ac_add_options --enable-debug
-#. "$topsrcdir/build/mozconfig.cache"
 ENABLE_MARIONETTE=1
 
 # Enable dump() from JS.

diff --git a/b2g/config/mozconfigs/ics_armv7a_gecko/nightly b/b2g/config/mozconfigs/ics_armv7a_gecko/nightly
@@ -13,7 +13,6 @@ export GONK_PRODUCT=generic
 ac_add_options --with-gonk-toolchain-prefix="$topsrcdir/gonk-toolchain/prebuilt/$TOOLCHAIN_HOST/toolchain/arm-linux-androideabi-4.4.x/bin/arm-linux-androideabi-"
 ac_add_options --enable-debug-symbols
 # ac_add_options --enable-profiling
-#. "$topsrcdir/build/mozconfig.cache"
 ENABLE_MARIONETTE=1
 
 # Enable dump() from JS.

diff --git a/b2g/config/mozconfigs/linux32_gecko/debug b/b2g/config/mozconfigs/linux32_gecko/debug
@@ -24,7 +24,6 @@ ac_add_options --enable-warnings-as-errors
 
 # Use sccache
 no_sccache=
-. "$topsrcdir/build/mozconfig.cache"
 
 #B2G options
 ac_add_options --enable-application=b2g

diff --git a/b2g/config/mozconfigs/linux32_gecko/nightly b/b2g/config/mozconfigs/linux32_gecko/nightly
@@ -24,7 +24,6 @@ ac_add_options --enable-warnings-as-errors
 
 # Use sccache
 no_sccache=
-. "$topsrcdir/build/mozconfig.cache"
 
 #B2G options
 ac_add_options --enable-application=b2g

diff --git a/b2g/config/mozconfigs/linux64_gecko/debug b/b2g/config/mozconfigs/linux64_gecko/debug
@@ -24,7 +24,6 @@ ac_add_options --enable-warnings-as-errors
 
 # Use sccache
 no_sccache=
-. "$topsrcdir/build/mozconfig.cache"
 
 #B2G options
 ac_add_options --enable-application=b2g

diff --git a/b2g/config/mozconfigs/linux64_gecko/nightly b/b2g/config/mozconfigs/linux64_gecko/nightly
@@ -24,7 +24,6 @@ ac_add_options --enable-warnings-as-errors
 
 # Use sccache
 no_sccache=
-. "$topsrcdir/build/mozconfig.cache"
 
 #B2G options
 ac_add_options --enable-application=b2g

diff --git a/b2g/config/tooltool-manifests/win32/releng.manifest b/b2g/config/tooltool-manifests/win32/releng.manifest
@@ -11,5 +11,12 @@
 "algorithm": "sha512",
 "filename": "moztt.tar.bz2",
 "unpack": "True"
+},
+{
+"size": 167175,
+"digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
+"algorithm": "sha512",
+"filename": "sccache.tar.bz2",
+"unpack": "True"
 }
 ]
diff --git a/b2g/dev/config/mozconfigs/macosx64/mulet b/b2g/dev/config/mozconfigs/macosx64/mulet
@@ -27,3 +27,4 @@ export MOZ_PACKAGE_JSSHELL=1
 MOZTTDIR=$topsrcdir/moztt
 
 . "$topsrcdir/build/mozconfig.common.override"
+. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/linux32/debug b/browser/config/mozconfigs/linux32/debug
@@ -11,7 +11,6 @@ MOZ_AUTOMATION_L10N_CHECK=0
 export MOZILLA_OFFICIAL=1
 
 #Use ccache
-. "$topsrcdir/build/mozconfig.cache"
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
@@ -22,3 +21,4 @@ export MOZ_PACKAGE_JSSHELL=1
 ac_add_options --with-branding=browser/branding/nightly
 
 . "$topsrcdir/build/mozconfig.common.override"
+. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/linux32/nightly b/browser/config/mozconfigs/linux32/nightly
@@ -10,7 +10,5 @@ STRIP_FLAGS="--strip-debug"
 
 ac_add_options --with-branding=browser/branding/nightly
 
-# Use ccache
-. "$topsrcdir/build/mozconfig.cache"
-
 . "$topsrcdir/build/mozconfig.common.override"
+. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/linux64/debug b/browser/config/mozconfigs/linux64/debug
@@ -10,9 +10,6 @@ MOZ_AUTOMATION_L10N_CHECK=0
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-# Use ccache
-. "$topsrcdir/build/mozconfig.cache"
-
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
 
@@ -22,3 +19,4 @@ export MOZ_PACKAGE_JSSHELL=1
 ac_add_options --with-branding=browser/branding/nightly
 
 . "$topsrcdir/build/mozconfig.common.override"
+. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/linux64/nightly b/browser/config/mozconfigs/linux64/nightly
@@ -10,7 +10,5 @@ STRIP_FLAGS="--strip-debug"
 
 ac_add_options --with-branding=browser/branding/nightly
 
-# Use ccache
-. "$topsrcdir/build/mozconfig.cache"
-
 . "$topsrcdir/build/mozconfig.common.override"
+. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx-universal/beta b/browser/config/mozconfigs/macosx-universal/beta
@@ -3,3 +3,4 @@
 ac_add_options --enable-official-branding
 
 . "$topsrcdir/build/mozconfig.common.override"
+. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx-universal/l10n-mozconfig b/browser/config/mozconfigs/macosx-universal/l10n-mozconfig
@@ -10,8 +10,7 @@ if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
 
-. "$topsrcdir/build/mozconfig.cache"
-
 export MOZILLA_OFFICIAL=1
 
 . "$topsrcdir/build/mozconfig.common.override"
+. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx-universal/nightly b/browser/config/mozconfigs/macosx-universal/nightly
@@ -13,3 +13,4 @@ fi
 ac_add_options --with-branding=browser/branding/nightly
 
 . "$topsrcdir/build/mozconfig.common.override"
+. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx-universal/release b/browser/config/mozconfigs/macosx-universal/release
@@ -9,3 +9,4 @@ ac_add_options --enable-official-branding
 export BUILDING_RELEASE=1
 
 . "$topsrcdir/build/mozconfig.common.override"
+. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx64/debug b/browser/config/mozconfigs/macosx64/debug
@@ -21,3 +21,4 @@ export MOZ_PACKAGE_JSSHELL=1
 ac_add_options --with-branding=browser/branding/nightly
 
 . "$topsrcdir/build/mozconfig.common.override"
+. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx64/debug-static-analysis b/browser/config/mozconfigs/macosx64/debug-static-analysis
@@ -13,3 +13,4 @@ ac_add_options --enable-warnings-as-errors
 ac_add_options --enable-clang-plugin
 
 . "$topsrcdir/build/mozconfig.common.override"
+. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx64/l10n-mozconfig b/browser/config/mozconfigs/macosx64/l10n-mozconfig
@@ -4,6 +4,6 @@ ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --with-branding=browser/branding/nightly
-. "$topsrcdir/build/mozconfig.cache"
 
 . "$topsrcdir/build/mozconfig.common.override"
+. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx64/nightly b/browser/config/mozconfigs/macosx64/nightly
@@ -19,3 +19,4 @@ export MOZ_PACKAGE_JSSHELL=1
 ac_add_options --with-branding=browser/branding/nightly
 
 . "$topsrcdir/build/mozconfig.common.override"
+. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/win32/debug b/browser/config/mozconfigs/win32/debug
@@ -28,6 +28,5 @@ export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-branding=browser/branding/nightly
 
-. "$topsrcdir/build/mozconfig.cache"
-
 . "$topsrcdir/build/mozconfig.common.override"
+. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/win32/nightly b/browser/config/mozconfigs/win32/nightly
@@ -6,6 +6,5 @@ ac_add_options --enable-profiling
 
 ac_add_options --with-branding=browser/branding/nightly
 
-. "$topsrcdir/build/mozconfig.cache"
-
 . "$topsrcdir/build/mozconfig.common.override"
+. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/win64/debug b/browser/config/mozconfigs/win64/debug
@@ -30,6 +30,5 @@ ac_add_options --with-branding=browser/branding/nightly
 
 . $topsrcdir/build/win64/mozconfig.vs2013
 
-. "$topsrcdir/build/mozconfig.cache"
-
 . "$topsrcdir/build/mozconfig.common.override"
+. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/win64/nightly b/browser/config/mozconfigs/win64/nightly
@@ -7,6 +7,5 @@ ac_add_options --enable-profiling
 
 ac_add_options --with-branding=browser/branding/nightly
 
-. "$topsrcdir/build/mozconfig.cache"
-
 . "$topsrcdir/build/mozconfig.common.override"
+. "$topsrcdir/build/mozconfig.cache"
diff --git a/build/macosx/mozconfig.common b/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
diff --git a/build/mozconfig.cache b/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*)

diff --git a/mobile/android/config/mozconfigs/android-api-11/debug b/mobile/android/config/mozconfigs/android-api-11/debug
@@ -16,4 +16,3 @@ ac_add_options --with-branding=mobile/android/branding/nightly
 ac_add_options --enable-warnings-as-errors
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
-
diff --git a/mobile/android/config/mozconfigs/common.override b/mobile/android/config/mozconfigs/common.override
@@ -5,3 +5,4 @@
 # This file is included at the bottom of all native android mozconfigs
 
 . "$topsrcdir/build/mozconfig.common.override"
+. "$topsrcdir/build/mozconfig.cache"
diff --git a/xulrunner/config/mozconfigs/common.override b/xulrunner/config/mozconfigs/common.override
@@ -5,3 +5,4 @@
 # This file is included at the bottom of all xulrunner mozconfigs
 
 . "$topsrcdir/build/mozconfig.common.override"
+. "$topsrcdir/build/mozconfig.cache"
diff --git a/xulrunner/config/mozconfigs/linux32/xulrunner b/xulrunner/config/mozconfigs/linux32/xulrunner
@@ -6,7 +6,4 @@ ac_add_options --disable-tests
 
 . $topsrcdir/build/unix/mozconfig.linux32
 
-#Use ccache
-. "$topsrcdir/build/mozconfig.cache"
-
 . "$topsrcdir/xulrunner/config/mozconfigs/common.override"
diff --git a/xulrunner/config/mozconfigs/linux32/xulrunner-qt b/xulrunner/config/mozconfigs/linux32/xulrunner-qt
@@ -6,9 +6,6 @@ ac_add_options --disable-tests
 
 . $topsrcdir/build/unix/mozconfig.linux32
 
-#Use ccache
-. "$topsrcdir/build/mozconfig.cache"
-
 # 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

diff --git a/xulrunner/config/mozconfigs/linux64/xulrunner b/xulrunner/config/mozconfigs/linux64/xulrunner
@@ -6,7 +6,4 @@ ac_add_options --disable-tests
 
 . $topsrcdir/build/unix/mozconfig.linux
 
-#Use ccache
-. "$topsrcdir/build/mozconfig.cache"
-
 . "$topsrcdir/xulrunner/config/mozconfigs/common.override"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,4 @@
		# This file is included at the bottom of all b2g mozconfigs

		. "$topsrcdir/build/mozconfig.common.override"
		. "$topsrcdir/build/mozconfig.cache"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,3 +27,4 @@ export MOZ_PACKAGE_JSSHELL=1
		MOZTTDIR=$topsrcdir/moztt

		. "$topsrcdir/build/mozconfig.common.override"
		. "$topsrcdir/build/mozconfig.cache"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,4 @@
		ac_add_options --enable-official-branding

		. "$topsrcdir/build/mozconfig.common.override"
		. "$topsrcdir/build/mozconfig.cache"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,3 +13,4 @@ fi
		ac_add_options --with-branding=browser/branding/nightly

		. "$topsrcdir/build/mozconfig.common.override"
		. "$topsrcdir/build/mozconfig.cache"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,3 +9,4 @@ ac_add_options --enable-official-branding
		export BUILDING_RELEASE=1

		. "$topsrcdir/build/mozconfig.common.override"
		. "$topsrcdir/build/mozconfig.cache"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,3 +21,4 @@ export MOZ_PACKAGE_JSSHELL=1
		ac_add_options --with-branding=browser/branding/nightly

		. "$topsrcdir/build/mozconfig.common.override"
		. "$topsrcdir/build/mozconfig.cache"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,3 +13,4 @@ ac_add_options --enable-warnings-as-errors
		ac_add_options --enable-clang-plugin

		. "$topsrcdir/build/mozconfig.common.override"
		. "$topsrcdir/build/mozconfig.cache"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,3 +19,4 @@ export MOZ_PACKAGE_JSSHELL=1
		ac_add_options --with-branding=browser/branding/nightly

		. "$topsrcdir/build/mozconfig.common.override"
		. "$topsrcdir/build/mozconfig.cache"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,4 +16,3 @@ ac_add_options --with-branding=mobile/android/branding/nightly
		ac_add_options --enable-warnings-as-errors

		. "$topsrcdir/mobile/android/config/mozconfigs/common.override"