[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - Makefile.am

[Jan Holesovsky]

 Makefile.am |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit cc0e379773fc5be3c9683081398c6e6ae2823364
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Apr 5 15:38:33 2017 +0200

    Run fc-cache before launching loolwsd.
    
    Otherwise the loolforkit startup can take too long with too many fonts.
    
    Change-Id: Ibbffab223a70a34bdb993e3b69a5b3d971176a93

diff --git a/Makefile.am b/Makefile.am
index d6fd1ef1..d0e1a40b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -224,6 +224,7 @@ clean-local:
 
 run: all @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
 	@echo "Launching loolwsd"
+	@fc-cache "@LO_PATH@"/share/fonts/truetype
 	@cp $(abs_top_srcdir)/test/data/hello.odt $(abs_top_srcdir)/test/data/hello-world.odt
 	@echo
 	./loolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@" --o:lo_template_path="@LO_PATH@" \
@@ -236,6 +237,7 @@ run: all @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
 
 run-valgrind: all @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
 	@echo "Launching loolwsd under valgrind (but not forkit/loolkit, yet)"
+	@fc-cache "@LO_PATH@"/share/fonts/truetype
 	@cp $(abs_top_srcdir)/test/data/hello.odt $(abs_top_srcdir)/test/data/hello-world.odt
 	valgrind --tool=memcheck --trace-children=no -v --read-var-info=yes \
 		./loolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@" --o:lo_template_path="@LO_PATH@" \
@@ -248,6 +250,7 @@ run-valgrind: all @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
 
 run-callgrind: all @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
 	@echo "Launching loolwsd under valgrind (but not forkit/loolkit, yet)"
+	@fc-cache "@LO_PATH@"/share/fonts/truetype
 	@cp $(abs_top_srcdir)/test/data/hello.odt $(abs_top_srcdir)/test/data/hello-world.odt
 	valgrind --tool=callgrind --simulate-cache=yes --dump-instr=yes --num-callers=50 --error-limit=no \
 		./loolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@" --o:lo_template_path="@LO_PATH@" \