summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2017-04-05 15:38:33 +0200
committerJan Holesovsky <kendy@collabora.com>2017-04-05 15:39:57 +0200
commit6e21b754ec185d076da29500f6a9211c99dd37bf (patch)
tree75fd3ccaeb1e87c723be336f1a5117f5eca6a577 /Makefile.am
parentsetThreadOwner() is now needed in the release builds too. (diff)
downloadonline-6e21b754ec185d076da29500f6a9211c99dd37bf.tar.gz
online-6e21b754ec185d076da29500f6a9211c99dd37bf.zip
Run fc-cache before launching loolwsd.
Otherwise the loolforkit startup can take too long with too many fonts. Change-Id: Ibbffab223a70a34bdb993e3b69a5b3d971176a93
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index c472180560..1f091c2723 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@" \