configure.ac | 5 ++++-
static/CustomTarget_emscripten_fs_image.mk | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 12ed25fb94fbbee15389467dc6ae02eddf811c34
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Wed Feb 5 17:24:40 2025 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Wed Feb 5 20:31:58 2025 +0100
Support Emscripten --with-main-module=
...i.e., stripping both Calc and Writer, which comes in handy when trying
e.g.
-fsanitize=address and the resulting binary would otherwise become too
large.
(Which also unearthed that the StartModule/menubar/menubar.xml had
erroneously
been added to the Writer section of
static/CustomTarget_emscripten_fs_image.mk
ever since 88b94aafc23348238b2d112682bc55719d1978a3 "WASM create and link
the
Emscripten FS image".)
Change-Id: Ia880040f51f15d33ed447a1c69838fa807f48ade
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181188
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
Tested-by: Jenkins
diff --git a/configure.ac b/configure.ac
index daac9b0a6dbe..59d83e1230ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4203,7 +4203,10 @@ if test "$cross_compiling" = "yes"; then
ENABLE_WASM_STRIP=TRUE
fi
if test "$_os" = "Emscripten"; then
- if test "$with_main_module" = "calc"; then
+ if test "$with_main_module" = ''; then
+ ENABLE_WASM_STRIP_CALC=TRUE
+ ENABLE_WASM_STRIP_WRITER=TRUE
+ elif test "$with_main_module" = "calc"; then
ENABLE_WASM_STRIP_WRITER=TRUE
elif test "$with_main_module" = "writer"; then
ENABLE_WASM_STRIP_CALC=TRUE
diff --git a/static/CustomTarget_emscripten_fs_image.mk
b/static/CustomTarget_emscripten_fs_image.mk
index 90b76cd1f4ae..0de368e09e00 100644
--- a/static/CustomTarget_emscripten_fs_image.mk
+++ b/static/CustomTarget_emscripten_fs_image.mk
@@ -272,6 +272,7 @@ gb_emscripten_fs_image_files := \
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/fps/ui/explorerfiledialog.ui
\
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/fps/ui/foldernamedialog.ui \
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/fps/ui/remotefilesdialog.ui
\
+
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/StartModule/menubar/menubar.xml
\
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/filter/oox-drawingml-adj-names \
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/filter/oox-drawingml-cs-presets \
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/filter/vml-shape-types \
@@ -333,7 +334,6 @@ gb_emscripten_fs_image_files += \
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/sglobal/toolbar/textstylebar.xml
\
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/sglobal/toolbar/toolbar.xml
\
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/sglobal/toolbar/viewerbar.xml
\
-
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/StartModule/menubar/menubar.xml
\
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/sweb/menubar/menubar.xml
\
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/sweb/popupmenu/anchor.xml
\
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/sweb/popupmenu/annotation.xml
\
