Makefile.am | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 6e21b754ec185d076da29500f6a9211c99dd37bf
Author: Jan Holesovsky <ke...@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 c4721805..1f091c27 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -223,6 +223,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@" \
@@ -235,6 +236,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@" \
@@ -247,6 +249,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@" \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
