Bug 1002606 - Enable sccache for mac try builds. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 30 Apr 2014 06:06:09 +0900
changeset 181218 54c16794c7e5f3e2ebbc4411df521194fc54124a
parent 181217 78d86c9ceee35a66570bb163aa8ff4dac2fda10c
child 181273 9d7d10a54e444dba42d60702ed743a842a466409
push id272
push userpvanderbeken@mozilla.com
push dateMon, 05 May 2014 16:31:18 +0000
reviewersmshal
bugs1002606
milestone32.0a1
Bug 1002606 - Enable sccache for mac try builds. r=mshal
b2g/config/mozconfigs/macosx64_gecko/debug
b2g/config/mozconfigs/macosx64_gecko/nightly
b2g/config/tooltool-manifests/macosx64/releng.manifest
browser/config/tooltool-manifests/macosx64/releng.manifest
build/macosx/mozconfig.common
--- a/b2g/config/mozconfigs/macosx64_gecko/debug
+++ b/b2g/config/mozconfigs/macosx64_gecko/debug
@@ -1,9 +1,13 @@
 . "$topsrcdir/b2g/config/mozconfigs/common"
+
+# Use sccache
+no_sccache=
+
 . $topsrcdir/build/macosx/mozconfig.common
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-signmar
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
@@ -17,16 +21,15 @@ export MOZ_TELEMETRY_REPORTING=1
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
 
 # B2G Stuff
 ac_add_options --enable-application=b2g
 ac_add_options --enable-debug-symbols
 ac_add_options --enable-debug
-ac_add_options --with-ccache
 ENABLE_MARIONETTE=1
 
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
 
 GAIADIR=$topsrcdir/gaia
 
 . "$topsrcdir/b2g/config/mozconfigs/common.override"
--- a/b2g/config/mozconfigs/macosx64_gecko/nightly
+++ b/b2g/config/mozconfigs/macosx64_gecko/nightly
@@ -1,9 +1,13 @@
 . "$topsrcdir/b2g/config/mozconfigs/common"
+
+# Use sccache
+no_sccache=
+
 . $topsrcdir/build/macosx/mozconfig.common
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-signmar
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
@@ -16,17 +20,16 @@ export MOZ_TELEMETRY_REPORTING=1
 #ac_add_options --with-macbundlename-prefix=Firefox
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
 
 # B2G Stuff
 ac_add_options --enable-application=b2g
 ac_add_options --enable-debug-symbols
-. "$topsrcdir/build/mozconfig.cache"
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
 
 GAIADIR=$topsrcdir/gaia
 
 # Build simulator xpi and phone tweaks for b2g-desktop
 FXOS_SIMULATOR=1
 
 . "$topsrcdir/b2g/config/mozconfigs/common.override"
--- a/b2g/config/tooltool-manifests/macosx64/releng.manifest
+++ b/b2g/config/tooltool-manifests/macosx64/releng.manifest
@@ -1,17 +1,23 @@
 [
 {
 "clang_version": "r170890"
 },
 {
-"size": 47,
-"digest": "2005a41fe97a5e00997063705f39d42b6a43b1cf7ba306cbc7b1513de34cdcd050fc6326efa2107f19ba0cc67914745dbf13154fa748010a93cf072481ef4aaa",
+"size": 88,
+"digest": "0d2ae9bcd7cea34ec0b768270725e98410dbb3bc150c7381e0dcf3eb5dbb3e69ac76dbb0f46b056151d6a6fa8681cab06da68173ae8598f3397b8f7628e67381",
 "algorithm": "sha512",
 "filename": "setup.sh"
 },
 {
 "size": 56126352,
 "digest": "e156e2a39abd5bf272ee30748a6825f22ddd27565b097c66662a2a6f2e9892bc5b4bf30a3552dffbe867dbfc39e7ee086e0b2cd7935f6ea216c0cf936178a88f",
 "algorithm": "sha512",
 "filename": "clang.tar.bz2"
+},
+{
+"size": 165464,
+"digest": "ee87db68eb63e417a366333e34a32d9220232bfb9c3e91b9941513acf0551f2603a836537ffef41a240430200970d83fa9271f55b8b5168d6967be595cdb50db",
+"algorithm": "sha512",
+"filename": "sccache.tar.bz2"
 }
 ]
--- a/browser/config/tooltool-manifests/macosx64/releng.manifest
+++ b/browser/config/tooltool-manifests/macosx64/releng.manifest
@@ -1,17 +1,23 @@
 [
 {
 "clang_version": "r183744"
 }, 
 {
-"size": 47, 
-"digest": "2005a41fe97a5e00997063705f39d42b6a43b1cf7ba306cbc7b1513de34cdcd050fc6326efa2107f19ba0cc67914745dbf13154fa748010a93cf072481ef4aaa", 
-"algorithm": "sha512", 
+"size": 88,
+"digest": "0d2ae9bcd7cea34ec0b768270725e98410dbb3bc150c7381e0dcf3eb5dbb3e69ac76dbb0f46b056151d6a6fa8681cab06da68173ae8598f3397b8f7628e67381",
+"algorithm": "sha512",
 "filename": "setup.sh"
 }, 
 {
 "size": 59602619, 
 "digest": "86662ebc0ef650490559005948c4f0cb015dad72c7cac43732c2bf2995247081e30c139cf8008d19670a0009fc302c4eee2676981ee3f9ff4a15c01af22b783b", 
 "algorithm": "sha512", 
 "filename": "clang.tar.bz2"
+},
+{
+"size": 165464,
+"digest": "ee87db68eb63e417a366333e34a32d9220232bfb9c3e91b9941513acf0551f2603a836537ffef41a240430200970d83fa9271f55b8b5168d6967be595cdb50db",
+"algorithm": "sha512",
+"filename": "sccache.tar.bz2"
 }
 ]
--- a/build/macosx/mozconfig.common
+++ b/build/macosx/mozconfig.common
@@ -19,9 +19,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
 
-ac_add_options --with-ccache
+. "$topsrcdir/build/mozconfig.cache"