Bug 1011562 - Ship Firefox OS fonts with the simulator. r=fabrice, r=mshal
authorJan Keromnes <janx@linux.com>
Tue, 21 Oct 2014 12:34:00 -0400
changeset 238195 9cf689a48b8f348039f7804127b10baa1ee6d4b6
parent 238194 2cdf87a14e8c45262b055bad1ba92b05f1238192
child 238196 78245457fc60562f8c753b26b1b3b8c3fe8ceacc
push id660
push userraliiev@mozilla.com
push dateWed, 18 Feb 2015 20:30:48 +0000
treeherdermozilla-release@49e493494178 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfabrice, mshal
bugs1011562
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1011562 - Ship Firefox OS fonts with the simulator. r=fabrice, r=mshal
b2g/app/Makefile.in
b2g/installer/package-manifest.in
configure.in
--- a/b2g/app/Makefile.in
+++ b/b2g/app/Makefile.in
@@ -15,16 +15,24 @@ UA_UPDATE_FILE = ua-update.json
 
 UA_UPDATE_FILES = $(UA_UPDATE_FILE)
 UA_UPDATE_DEST  = $(FINAL_TARGET)
 INSTALL_TARGETS += UA_UPDATE
 
 # Make sure the standalone glue doesn't try to get libxpcom.so from b2g/app.
 NSDISTMODE = copy
 
+# Copy the Firefox OS fonts if available
+ifdef MOZTTDIR
+include $(MOZTTDIR)/fonts.mk
+MOZTT_DEST = $(FINAL_TARGET)/fonts
+MOZTT_FILES = $(patsubst external/moztt/%,$(MOZTTDIR)/%,$(filter external/moztt/%,$(subst :, ,$(PRODUCT_COPY_FILES))))
+INSTALL_TARGETS += MOZTT
+endif
+
 include $(topsrcdir)/config/rules.mk
 
 APP_ICON = b2g
 
 ifeq ($(OS_ARCH),WINNT)
 REDIT_PATH = $(LIBXUL_DIST)/bin
 endif
 
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -881,8 +881,12 @@ bin/components/@DLL_PREFIX@nkgnomevfs@DL
 @BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
 #endif
 
 #ifdef PACKAGE_GAIA
 [gaia]
 @BINPATH@/gaia/*
 @BINPATH@/b2g-bin@BIN_SUFFIX@
 #endif
+
+#ifdef PACKAGE_MOZTT
+@BINPATH@/fonts/*
+#endif
--- a/configure.in
+++ b/configure.in
@@ -178,16 +178,25 @@ if test -n "$FXOS_SIMULATOR" -a -z "$GAI
     AC_MSG_ERROR([FXOS_SIMULATOR=1 requires GAIADIR to be defined])
 fi
 
 if test -n "$FXOS_SIMULATOR" ; then
     AC_DEFINE(FXOS_SIMULATOR)
     AC_SUBST(FXOS_SIMULATOR)
 fi
 
+if test -n "$MOZTTDIR" -a ! -d "$MOZTTDIR" ; then
+    AC_MSG_ERROR([MOZTTDIR '$MOZTTDIR' isn't a valid directory])
+fi
+
+AC_SUBST(MOZTTDIR)
+if test -n "$MOZTTDIR" ; then
+    AC_DEFINE(PACKAGE_MOZTT)
+fi
+
 MOZ_ARG_WITH_STRING(gonk,
 [  --with-gonk=DIR
                location of gonk dir],
     gonkdir=$withval)
 
 MOZ_ARG_WITH_STRING(gonk-toolchain-prefix,
 [  --with-gonk-toolchain-prefix=DIR
                           prefix to gonk toolchain commands],