Revert unwanted change of hello.odt, and prevent that from happening again.

This commit is contained in:
Jan Holesovsky 2016-04-14 11:36:18 +02:00
parent d8c9128d35
commit 1e58864230
3 changed files with 3 additions and 1 deletions

1
loolwsd/.gitignore vendored
View file

@ -29,6 +29,7 @@ m4
systemplate
test-driver
jails
test/data/hello-world.odt
*.o
*.exe

View file

@ -105,8 +105,9 @@ clean-local:
run: @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
@echo "Launching loolwsd - launch this in your browser:"
@cp $(abs_top_srcdir)/test/data/hello.odt $(abs_top_srcdir)/test/data/hello-world.odt
@PROTOCOL="http" ; if test "z@ENABLE_SSL@" != "z"; then PROTOCOL="https" ; fi ; \
echo " $$PROTOCOL://localhost:9980/loleaflet/dist/loleaflet.html?file_path=file://$(abs_top_srcdir)/test/data/hello.odt"
echo " $$PROTOCOL://localhost:9980/loleaflet/dist/loleaflet.html?file_path=file://$(abs_top_srcdir)/test/data/hello-world.odt"
@echo
./loolwsd --systemplate="@SYSTEMPLATE_PATH@" --lotemplate="@LO_PATH@" \
--childroot="@JAILS_PATH@" --allowlocalstorage

Binary file not shown.