Bug 989147 - Use new sccache for Linux and Android builds. r=gps, a=NPOTB
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 28 Mar 2014 18:41:06 +0900
changeset 192875 9748ca8aed6127589aaea6d28ad6c6cebae5d9c1
parent 192874 545cc8ee0dc2a55ab563c683bec42fc7e63e8df8
child 192876 655c2f12da34a6007aeab279d17b9b36b4611b6e
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps, NPOTB
bugs989147
milestone30.0a2
Bug 989147 - Use new sccache for Linux and Android builds. r=gps, a=NPOTB
browser/config/tooltool-manifests/linux32/releng.manifest
browser/config/tooltool-manifests/linux64/releng.manifest
build/mozconfig.cache
build/sccache.mk
mobile/android/config/tooltool-manifests/android-armv6/releng.manifest
mobile/android/config/tooltool-manifests/android-x86/releng.manifest
mobile/android/config/tooltool-manifests/android/releng.manifest
--- a/browser/config/tooltool-manifests/linux32/releng.manifest
+++ b/browser/config/tooltool-manifests/linux32/releng.manifest
@@ -7,14 +7,14 @@
 }, 
 {
 "size": 80458572,
 "digest": "e5101f9dee1e462f6cbd3897ea57eede41d23981825c7b20d91d23ab461875d54d3dfc24999aa58a31e8b01f49fb3140e05ffe5af2957ef1d1afb89fd0dfe1ad",
 "algorithm": "sha512", 
 "filename": "gcc.tar.xz"
 },
 {
-"size": 150816,
-"digest": "af25ecf03b65795d21f011939984b130db167a4efc4f306700f373854f9d7ae664662cb7812c3d737eace7f3735324daa6eb540b5e42f90189b0d9a8dd5f4c9f",
+"size": 160232,
+"digest": "8656c3fc2daa66839ec81a0edbd9759040a83c7a41c3e472d7f90508b80eefd008b87305dc8549b4ff6098dc33fe17fedc9b4eb76cf5307d5f22dae925c033db",
 "algorithm": "sha512",
 "filename": "sccache.tar.xz"
 }
 ]
--- a/browser/config/tooltool-manifests/linux64/releng.manifest
+++ b/browser/config/tooltool-manifests/linux64/releng.manifest
@@ -7,14 +7,14 @@
 }, 
 {
 "size": 80458572,
 "digest": "e5101f9dee1e462f6cbd3897ea57eede41d23981825c7b20d91d23ab461875d54d3dfc24999aa58a31e8b01f49fb3140e05ffe5af2957ef1d1afb89fd0dfe1ad",
 "algorithm": "sha512", 
 "filename": "gcc.tar.xz"
 },
 {
-"size": 150816,
-"digest": "af25ecf03b65795d21f011939984b130db167a4efc4f306700f373854f9d7ae664662cb7812c3d737eace7f3735324daa6eb540b5e42f90189b0d9a8dd5f4c9f",
+"size": 160232,
+"digest": "8656c3fc2daa66839ec81a0edbd9759040a83c7a41c3e472d7f90508b80eefd008b87305dc8549b4ff6098dc33fe17fedc9b4eb76cf5307d5f22dae925c033db",
 "algorithm": "sha512",
 "filename": "sccache.tar.xz"
 }
 ]
--- a/build/mozconfig.cache
+++ b/build/mozconfig.cache
@@ -17,9 +17,11 @@ if test -z "$SCCACHE_DISABLE" -a -f "$to
 fi
 
 if test -z "$bucket"; then
     ac_add_options --with-ccache
 else
     mk_add_options "export SCCACHE_BUCKET=$bucket"
     mk_add_options "export SCCACHE_NAMESERVER=169.254.169.253"
     ac_add_options "--with-compiler-wrapper=python2.7 $topsrcdir/sccache/sccache.py"
+    mk_add_options MOZ_PREFLIGHT+=build/sccache.mk
+    mk_add_options MOZ_POSTFLIGHT+=build/sccache.mk
 fi
new file mode 100644
--- /dev/null
+++ b/build/sccache.mk
@@ -0,0 +1,7 @@
+preflight:
+	# Terminate any sccache server that might still be around
+	-python2.7 $(TOPSRCDIR)/sccache/sccache.py > /dev/null 2>&1
+
+postflight:
+	# Terminate sccache server. This prints sccache stats.
+	-python2.7 $(TOPSRCDIR)/sccache/sccache.py
--- a/mobile/android/config/tooltool-manifests/android-armv6/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android-armv6/releng.manifest
@@ -13,14 +13,14 @@
 },
 {
 "size": 292,
 "digest": "974584133bcee7648bfca4bf95145239926ece2ab788a9b9850d3ad77c390af6efcf4d888c5f9654201262d9c8b8ecf16022ada0182854dc8a89ecf14649193e",
 "algorithm": "sha512",
 "filename": "setup.sh"
 },
 {
-"size": 150816,
-"digest": "af25ecf03b65795d21f011939984b130db167a4efc4f306700f373854f9d7ae664662cb7812c3d737eace7f3735324daa6eb540b5e42f90189b0d9a8dd5f4c9f",
+"size": 160232,
+"digest": "8656c3fc2daa66839ec81a0edbd9759040a83c7a41c3e472d7f90508b80eefd008b87305dc8549b4ff6098dc33fe17fedc9b4eb76cf5307d5f22dae925c033db",
 "algorithm": "sha512",
 "filename": "sccache.tar.xz"
 }
 ]
--- a/mobile/android/config/tooltool-manifests/android-x86/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android-x86/releng.manifest
@@ -13,14 +13,14 @@
 },
 {
 "size": 292,
 "digest": "974584133bcee7648bfca4bf95145239926ece2ab788a9b9850d3ad77c390af6efcf4d888c5f9654201262d9c8b8ecf16022ada0182854dc8a89ecf14649193e",
 "algorithm": "sha512",
 "filename": "setup.sh"
 },
 {
-"size": 150816,
-"digest": "af25ecf03b65795d21f011939984b130db167a4efc4f306700f373854f9d7ae664662cb7812c3d737eace7f3735324daa6eb540b5e42f90189b0d9a8dd5f4c9f",
+"size": 160232,
+"digest": "8656c3fc2daa66839ec81a0edbd9759040a83c7a41c3e472d7f90508b80eefd008b87305dc8549b4ff6098dc33fe17fedc9b4eb76cf5307d5f22dae925c033db",
 "algorithm": "sha512",
 "filename": "sccache.tar.xz"
 }
 ]
--- a/mobile/android/config/tooltool-manifests/android/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android/releng.manifest
@@ -13,14 +13,14 @@
 },
 {
 "size": 292,
 "digest": "974584133bcee7648bfca4bf95145239926ece2ab788a9b9850d3ad77c390af6efcf4d888c5f9654201262d9c8b8ecf16022ada0182854dc8a89ecf14649193e",
 "algorithm": "sha512",
 "filename": "setup.sh"
 },
 {
-"size": 150816,
-"digest": "af25ecf03b65795d21f011939984b130db167a4efc4f306700f373854f9d7ae664662cb7812c3d737eace7f3735324daa6eb540b5e42f90189b0d9a8dd5f4c9f",
+"size": 160232,
+"digest": "8656c3fc2daa66839ec81a0edbd9759040a83c7a41c3e472d7f90508b80eefd008b87305dc8549b4ff6098dc33fe17fedc9b4eb76cf5307d5f22dae925c033db",
 "algorithm": "sha512",
 "filename": "sccache.tar.xz"
 }
 ]