mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WASM clarified --with-wasm-module

Browse Source 
Option is for WASM only, so shouldn't be named --with-main-module.

Also the option's default value changed since it was introduced, so the
documentation became outdated. See commits:

fe678ffc6f Emscripten: No need to pass --with-main-module into build configure
437b4d802c Fix default value of Emscripten --with-main-module
8aef8c3a14 Make it possible to run either Writer or Calc in the same Emscripten thing
97ee126d69 WASM add Calc as optional build result, make it build & run

Change-Id: I29aeeb9a840ec07e46cbf153c535b3fca9d88cd1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182798
Tested-by: Jenkins
Reviewed-by: Moritz Duge <moritz.duge@allotropia.de>
This commit is contained in:
Moritz Duge
2025-03-11 22:47:14 +01:00
parent cde8bf6bcf
commit 3918e3e22e
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@@ -2170,11 +2170,11 @@ AC_ARG_ENABLE(wasm-strip,
[Strip the static build like for WASM/emscripten platform.]), [Strip the static build like for WASM/emscripten platform.]),
,) ,)
AC_ARG_WITH(main-module, AC_ARG_WITH(wasm-module,
AS_HELP_STRING([--with-main-module=<writer/calc/impress>], AS_HELP_STRING([--with-wasm-module=<writer/calc/impress>],
[Specify which main module to build for wasm. [Specify which main module to build for wasm.
Default value is 'writer'.]), Default value is 'calc writer'.]),
, [with_main_module='calc writer']) , [with_wasm_module='calc writer'])
# Don't include impress by default. Debug builds become too large for Chromium # Don't include impress by default. Debug builds become too large for Chromium
# with 'calc impress writer' enabled. (buffer source exceeds maximum size) # with 'calc impress writer' enabled. (buffer source exceeds maximum size)
@@ -4178,7 +4178,7 @@ if test "$cross_compiling" = "yes"; then
ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS=TRUE ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS=TRUE
ENABLE_WASM_STRIP_CALC=TRUE ENABLE_WASM_STRIP_CALC=TRUE
ENABLE_WASM_STRIP_WRITER=TRUE ENABLE_WASM_STRIP_WRITER=TRUE
for i in $with_main_module; do for i in $with_wasm_module; do
case "$i" in case "$i" in
calc) calc)
ENABLE_WASM_STRIP_ACCESSIBILITY= ENABLE_WASM_STRIP_ACCESSIBILITY=
@@ -4192,7 +4192,7 @@ if test "$cross_compiling" = "yes"; then
ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS= ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS=
;; ;;
*) *)
AC_MSG_ERROR([Unknown --with-main-module "$i"]) AC_MSG_ERROR([Unknown --with-wasm-module "$i"])
esac esac
done done
if test "$ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS" = TRUE; then if test "$ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS" = TRUE; then

2
static/README.wasm.md
View File

@@ -433,7 +433,7 @@ For instance, this autogen.input works for me:
`--disable-crashdump` `--disable-crashdump`
`--host=wasm32-local-emscripten` `--host=wasm32-local-emscripten`
`--disable-gui` `--disable-gui`
`--with-main-module=writer` `--with-wasm-module=writer`
`--with-package-format=emscripten` `--with-package-format=emscripten`
For building LO core for use in COWASM, it is known to work to use For building LO core for use in COWASM, it is known to work to use