configure.ac | 7 +++++--
static/CustomTarget_emscripten_fs_image.mk | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit c390e050d3c6530a91ec43d6e93ee77199770df4
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Fri Feb 7 15:57:35 2025 +0100
Commit: Moritz Duge <moritz.d...@allotropia.de>
CommitDate: Wed Mar 12 18:43:27 2025 +0100
Fix default value of Emscripten --with-main-module
...broken by 12ed25fb94fbbee15389467dc6ae02eddf811c34 "Support Emscripten
--with-main-module="
Change-Id: I0dc3e32e4fbc0f4c90fd11b6ac56ec3ac6d67ae5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181259
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
(cherry picked from commit 437b4d802ccec2eb1395a4e4137a4a0af039de5a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182800
Reviewed-by: Moritz Duge <moritz.d...@allotropia.de>
Tested-by: allotropia jenkins <jenk...@allotropia.de>
diff --git a/configure.ac b/configure.ac
index e073c6c92d1c..ded9172132f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2144,7 +2144,7 @@ AC_ARG_WITH(main-module,
AS_HELP_STRING([--with-main-module=<writer/calc>],
[Specify which main module to build for wasm.
Default value is 'writer'.]),
-,)
+, [with_main_module=calc,writer])
if test "$_os" = Emscripten; then
AC_ARG_ENABLE(emscripten-proxy-to-pthread,
commit 6b65b95c8d9c481d71869c391755906532fca466
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Wed Feb 5 17:24:40 2025 +0100
Commit: Moritz Duge <moritz.d...@allotropia.de>
CommitDate: Wed Mar 12 18:43:18 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
(cherry picked from commit 12ed25fb94fbbee15389467dc6ae02eddf811c34)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182794
Reviewed-by: Moritz Duge <moritz.d...@allotropia.de>
Tested-by: allotropia jenkins <jenk...@allotropia.de>
diff --git a/configure.ac b/configure.ac
index 0e10d33c4cc0..e073c6c92d1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4104,7 +4104,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 bc71f15185fe..1f57905dc239 100644
--- a/static/CustomTarget_emscripten_fs_image.mk
+++ b/static/CustomTarget_emscripten_fs_image.mk
@@ -274,6 +274,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 \
@@ -335,7 +336,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
\
