strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More useful to have an EMSCRIPTEN_EXTRA_SOFFICE_PRE_JS

Browse source 
...than an EMSCRIPTEN_EXTRA_SOFFICE_POST_JS.  That way, we can e.g. set up
Module.arguments there.

Change-Id: I4990ab6daac2f74326ab2ee9508828f1b79bceb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172154
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
This commit is contained in:
Stephan Bergmann 2024-08-20 17:52:49 +02:00
parent ce2a5f6bc8
commit b88b5f53a2
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config_host.mk.in
View file

@ -147,7 +147,7 @@ export DPKG=@DPKG@
export EBOOK_CFLAGS=$(gb_SPACE)@EBOOK_CFLAGS@
export EBOOK_LIBS=$(gb_SPACE)@EBOOK_LIBS@
export EMSDK_FILE_PACKAGER=@EMSDK_FILE_PACKAGER@
export EMSCRIPTEN_EXTRA_SOFFICE_POST_JS=@EMSCRIPTEN_EXTRA_SOFFICE_POST_JS@
export EMSCRIPTEN_EXTRA_SOFFICE_PRE_JS=@EMSCRIPTEN_EXTRA_SOFFICE_PRE_JS@
export ENABLE_ANDROID_LOK=@ENABLE_ANDROID_LOK@
export ENABLE_ANDROID_EDITING=@ENABLE_ANDROID_EDITING@
export ENABLE_AVAHI=@ENABLE_AVAHI@

2
configure.ac
View file

@ -1489,7 +1489,7 @@ if test "$_os" = "Emscripten"; then
BUILD_TYPE="$BUILD_TYPE EMSCRIPTEN"
fi
AC_SUBST(EMSDK_FILE_PACKAGER)
AC_SUBST(EMSCRIPTEN_EXTRA_SOFFICE_POST_JS)
AC_SUBST(EMSCRIPTEN_EXTRA_SOFFICE_PRE_JS)
###############################################################################
# Extensions switches --enable/--disable

4
desktop/Executable_soffice_bin.mk
View file

@ -75,12 +75,12 @@ endif
$(call gb_Executable_get_linktarget_target,soffice_bin): \
$(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.js \
$(SRCDIR)/static/emscripten/uno.js \
$(EMSCRIPTEN_EXTRA_SOFFICE_POST_JS)
$(EMSCRIPTEN_EXTRA_SOFFICE_PRE_JS)
$(eval $(call gb_Executable_add_ldflags,soffice_bin, \
--post-js $(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.js \
--post-js $(SRCDIR)/static/emscripten/uno.js \
$(foreach i,$(EMSCRIPTEN_EXTRA_SOFFICE_POST_JS),--post-js $(i)) \
$(foreach i,$(EMSCRIPTEN_EXTRA_SOFFICE_PRE_JS),--pre-js $(i)) \
))
ifeq ($(ENABLE_DBGUTIL)-$(gb_SUPPRESS_TESTS),TRUE-)

2
static/README.wasm.md
View file

@ -264,7 +264,7 @@ put next to the `qt_soffice.html` that you serve to the browser (i.e., in
Module.uno_scripts = ['./example.js'];
```
And rebuild LO configured with an additional
`EMSCRIPTEN_EXTRA_SOFFICE_POST_JS=/...path-to.../include.js`.
`EMSCRIPTEN_EXTRA_SOFFICE_PRE_JS=/...path-to.../include.js`.
## Tools for problem diagnosis