WASM add Calc as optional build result, make it build & run
Adding new config option: --with-main-module=<writer/calc>
With this switcher we can build only WASM writer module or
calc module. The default value is 'writer'.
This commit also reverts: 26603bc9ef
(WASM fix orcus native exception handling (NEH))
Because Calc import is using liborcus for loading styles.xml.
Change-Id: I4c330ef8eea7d08214bf357531ee0bf7383ab788
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137946
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Tested-by: Jenkins
This commit is contained in:
committed by
Thorsten Behrens
parent
06933af12a
commit
97ee126d69
@@ -50,14 +50,14 @@ endif
|
||||
|
||||
$(eval $(call gb_Module_add_moduledirs,libreoffice,\
|
||||
android \
|
||||
$(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \
|
||||
$(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
|
||||
animations \
|
||||
) \
|
||||
apple_remote \
|
||||
avmedia \
|
||||
$(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \
|
||||
$(if $(ENABLE_WASM_STRIP_CALC),, \
|
||||
basctl \
|
||||
) \
|
||||
) \
|
||||
basegfx \
|
||||
basic \
|
||||
bean \
|
||||
@@ -129,28 +129,28 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
|
||||
sal \
|
||||
salhelper \
|
||||
sax \
|
||||
$(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \
|
||||
$(if $(ENABLE_WASM_STRIP_CALC),, \
|
||||
sc \
|
||||
scaddins \
|
||||
sccomp \
|
||||
) \
|
||||
) \
|
||||
$(call gb_Helper_optional,DESKTOP,scp2) \
|
||||
scripting \
|
||||
$(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \
|
||||
$(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
|
||||
sd \
|
||||
sdext \
|
||||
) \
|
||||
$(call gb_Helper_optional,DESKTOP,setup_native) \
|
||||
sfx2 \
|
||||
shell \
|
||||
$(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \
|
||||
$(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
|
||||
slideshow \
|
||||
) \
|
||||
smoketest \
|
||||
solenv \
|
||||
soltools \
|
||||
sot \
|
||||
$(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \
|
||||
$(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
|
||||
starmath \
|
||||
) \
|
||||
$(if $(ENABLE_CUSTOMTARGET_COMPONENTS),static) \
|
||||
@@ -161,8 +161,10 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
|
||||
svgio \
|
||||
emfio \
|
||||
svx \
|
||||
$(if $(ENABLE_WASM_STRIP_WRITER),, \
|
||||
sw \
|
||||
swext \
|
||||
) \
|
||||
sysui \
|
||||
test \
|
||||
testtools \
|
||||
|
||||
Reference in New Issue
Block a user