Bug 1011562 - Ship Firefox OS fonts in Mulet. r=mshal, a=NPOTB
authorJan Keromnes <janx@linux.com>
Thu, 06 Nov 2014 04:30:00 -0500
changeset 235075 a0686d3ac4a9e979a8bbafd76e6f1c469097dab2
parent 235074 3a5f9751df57ceef95085f2cda809cc8be4b2163
child 235076 09623084ec90648836b77579f6533bc7e994913c
push id611
push userraliiev@mozilla.com
push dateMon, 05 Jan 2015 23:23:16 +0000
treeherdermozilla-release@345cd3b9c445 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal, NPOTB
bugs1011562
milestone35.0a2
Bug 1011562 - Ship Firefox OS fonts in Mulet. r=mshal, a=NPOTB
b2g/dev/config/mozconfigs/linux64/mulet
b2g/dev/config/mozconfigs/macosx64/mulet
b2g/dev/config/mozconfigs/win32/mulet
b2g/dev/config/tooltool-manifests/linux64/releng.manifest
b2g/dev/config/tooltool-manifests/macosx64/releng.manifest
b2g/dev/config/tooltool-manifests/win32/releng.manifest
--- a/b2g/dev/config/mozconfigs/linux64/mulet
+++ b/b2g/dev/config/mozconfigs/linux64/mulet
@@ -1,3 +1,7 @@
 . "$topsrcdir/browser/config/mozconfigs/linux64/nightly"
 
 ac_add_options --enable-application=b2g/dev
+
+# Include Firefox OS fonts.
+# TODO Uncomment after Mulet ships with the fonts (bug 1011562).
+#MOZTTDIR=$topsrcdir/moztt
--- a/b2g/dev/config/mozconfigs/macosx64/mulet
+++ b/b2g/dev/config/mozconfigs/macosx64/mulet
@@ -16,9 +16,13 @@ export MOZILLA_OFFICIAL=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
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
+# Include Firefox OS fonts.
+# TODO Uncomment after Mulet ships with the fonts (bug 1011562).
+#MOZTTDIR=$topsrcdir/moztt
+
 . "$topsrcdir/build/mozconfig.common.override"
--- a/b2g/dev/config/mozconfigs/win32/mulet
+++ b/b2g/dev/config/mozconfigs/win32/mulet
@@ -1,3 +1,7 @@
 . "$topsrcdir/browser/config/mozconfigs/win32/nightly"
 
 ac_add_options --enable-application=b2g/dev
+
+# Include Firefox OS fonts.
+# TODO Uncomment after Mulet ships with the fonts (bug 1011562).
+#MOZTTDIR=$topsrcdir/moztt
new file mode 100644
--- /dev/null
+++ b/b2g/dev/config/tooltool-manifests/linux64/releng.manifest
@@ -0,0 +1,27 @@
+[
+{
+"size": 82,
+"digest": "70a6126249e40aa1da32248bf6bfe45e0d8c87334579ec0cf69403e61b635e27c766d9bf08d530978286552f158ee24c74b0168a57cc6b734dcfed4fc5e09cff",
+"algorithm": "sha512",
+"filename": "setup.sh"
+},
+{
+"size": 80458572,
+"digest": "e5101f9dee1e462f6cbd3897ea57eede41d23981825c7b20d91d23ab461875d54d3dfc24999aa58a31e8b01f49fb3140e05ffe5af2957ef1d1afb89fd0dfe1ad",
+"algorithm": "sha512",
+"filename": "gcc.tar.xz"
+},
+{
+"size": 168320,
+"digest": "c0f4a2da0b07ca6fc69290fbc5ed68f56c6b1ba4d593b220fd49b14ac4885e6ec949e695fd9a7ac464e0e86b652e99f6bd4af849fec072264b29a8f9686d2fc4",
+"algorithm": "sha512",
+"filename": "sccache.tar.bz2"
+},
+{
+"size": 31057326,
+"digest": "b844c3e52be493d2cacafa58c4a924b89c9be8d2dcc2a7c71aed58c253d8035fba4d51df309f73e3c4342a1f3c3898a9a25c4815e2112888d1280f43c41c8e51",
+"algorithm": "sha512",
+"filename": "moztt.tar.bz2",
+"unpack": "True"
+}
+]
new file mode 100644
--- /dev/null
+++ b/b2g/dev/config/tooltool-manifests/macosx64/releng.manifest
@@ -0,0 +1,30 @@
+[
+{
+"clang_version": "r183744"
+},
+{
+"size": 88,
+"digest": "0d2ae9bcd7cea34ec0b768270725e98410dbb3bc150c7381e0dcf3eb5dbb3e69ac76dbb0f46b056151d6a6fa8681cab06da68173ae8598f3397b8f7628e67381",
+"algorithm": "sha512",
+"filename": "setup.sh"
+},
+{
+"size": 59602619,
+"digest": "86662ebc0ef650490559005948c4f0cb015dad72c7cac43732c2bf2995247081e30c139cf8008d19670a0009fc302c4eee2676981ee3f9ff4a15c01af22b783b",
+"algorithm": "sha512",
+"filename": "clang.tar.bz2"
+},
+{
+"size": 168320,
+"digest": "c0f4a2da0b07ca6fc69290fbc5ed68f56c6b1ba4d593b220fd49b14ac4885e6ec949e695fd9a7ac464e0e86b652e99f6bd4af849fec072264b29a8f9686d2fc4",
+"algorithm": "sha512",
+"filename": "sccache.tar.bz2"
+},
+{
+"size": 31057326,
+"digest": "b844c3e52be493d2cacafa58c4a924b89c9be8d2dcc2a7c71aed58c253d8035fba4d51df309f73e3c4342a1f3c3898a9a25c4815e2112888d1280f43c41c8e51",
+"algorithm": "sha512",
+"filename": "moztt.tar.bz2",
+"unpack": "True"
+}
+]
new file mode 100644
--- /dev/null
+++ b/b2g/dev/config/tooltool-manifests/win32/releng.manifest
@@ -0,0 +1,27 @@
+[
+{
+"size": 266240,
+"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
+"algorithm": "sha512",
+"filename": "mozmake.exe"
+},
+{
+"size": 51,
+"digest": "c8e40edb314eeabfb92c77cf5ff9a7857033f15dd65a00349bcf9e3e5b75624afc71f733b2ff7e029c20a78313038409c2bd022bf7e5a7e0c487fc2c2d640986",
+"algorithm": "sha512",
+"filename": "setup.sh"
+},
+{
+"size": 168320,
+"digest": "c0f4a2da0b07ca6fc69290fbc5ed68f56c6b1ba4d593b220fd49b14ac4885e6ec949e695fd9a7ac464e0e86b652e99f6bd4af849fec072264b29a8f9686d2fc4",
+"algorithm": "sha512",
+"filename": "sccache.tar.bz2"
+},
+{
+"size": 31057326,
+"digest": "b844c3e52be493d2cacafa58c4a924b89c9be8d2dcc2a7c71aed58c253d8035fba4d51df309f73e3c4342a1f3c3898a9a25c4815e2112888d1280f43c41c8e51",
+"algorithm": "sha512",
+"filename": "moztt.tar.bz2",
+"unpack": "True"
+}
+]