filter/Configuration_filter.mk | 6 ++++++
postprocess/CustomTarget_registry.mk | 22 +++++++++++++---------
2 files changed, 19 insertions(+), 9 deletions(-)
New commits:
commit 07deeedadda3d5d6b37b281c8d93060c1229ac7e
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Fri Feb 23 15:32:12 2024 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Fri Feb 23 20:58:40 2024 +0100
Emscripten: Filter out some filter configuration
...for which the underlying .xcd files are not included in
static/CustomTarget_emscripten_fs_image.mk, so causing
> warn:configmgr:42:1:configmgr/source/xcuparser.cxx:904: ignoring modify
of unknown set member node "StarOffice XML (Base)" in
"file:///instdir/program/../share/registry/res/fcfg_langpack_en-US.xcd"
etc. in the browser console. (Though note that the list of files to
include in
static/CustomTarget_emscripten_fs_image.mk is largely hard-coded, so
somewhat
guessing at the right ENABLE_WASM_STRIP_* to use here.)
Change-Id: If3d506514ccdbacb7e64cf62b08093831640c572
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163829
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 29d503c0cc33..b2d3b09689f0 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -294,6 +294,7 @@ $(eval $(call
filter_Configuration_add_others,fcfg_langpack,fcfg_base_others.xcu
contenthandlers/com_sun_star_comp_framework_oxt_handler \
))
+ifneq ($(ENABLE_WASM_STRIP_DBACCESS),TRUE)
# fcfg_database
$(eval $(call
filter_Configuration_add_types,fcfg_langpack,fcfg_database_types.xcu,filter/source/config/fragments/types,\
StarBase \
@@ -306,6 +307,7 @@ $(eval $(call
filter_Configuration_add_filters,fcfg_langpack,fcfg_database_filte
$(eval $(call
filter_Configuration_add_others,fcfg_langpack,fcfg_database_others.xcu,filter/source/config/fragments,\
frameloaders/org_openoffice_comp_dbflt_DBContentLoader2 \
))
+endif
ifeq ($(ENABLE_REPORTBUILDER),TRUE)
# fcfg_reportbuilder
@@ -562,6 +564,7 @@ $(eval $(call
filter_Configuration_add_filters,fcfg_langpack,fcfg_calc_filters.x
MS_Multiplan \
))
+ifneq ($(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),TRUE)
# fcfg_draw
$(eval $(call
filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/source/config/fragments/types,\
draw_ODG_FlatXML \
@@ -660,6 +663,7 @@ $(eval $(call
filter_Configuration_add_filters,fcfg_langpack,fcfg_impress_filter
MWAW_Presentation \
PowerPoint3 \
))
+endif
# fcfg_chart
$(eval $(call
filter_Configuration_add_types,fcfg_langpack,fcfg_chart_types.xcu,filter/source/config/fragments/types,\
@@ -676,6 +680,7 @@ $(eval $(call
filter_Configuration_add_others,fcfg_langpack,fcfg_chart_others.xc
frameloaders/com_sun_star_comp_chart2_ChartFrameLoader \
))
+ifneq ($(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),TRUE)
# fcfg_math
$(eval $(call
filter_Configuration_add_types,fcfg_langpack,fcfg_math_types.xcu,filter/source/config/fragments/types,\
math_MathML_XML_Math \
@@ -692,6 +697,7 @@ $(eval $(call
filter_Configuration_add_filters,fcfg_langpack,fcfg_math_filters.x
math_pdf_Export \
math8 \
))
+endif
# fcfg_drawgraphics
$(eval $(call
filter_Configuration_add_types,fcfg_langpack,fcfg_drawgraphics_types.xcu,filter/source/config/fragments/types,\
diff --git a/postprocess/CustomTarget_registry.mk
b/postprocess/CustomTarget_registry.mk
index c2f823369262..e7f5997984f8 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -35,9 +35,10 @@ postprocess_XCDS := \
postprocess_DEPS_base := main
postprocess_FILES_base := \
- $(call gb_XcuFilterFiltersTarget_get_target,fcfg_database_filters.xcu) \
- $(call gb_XcuFilterOthersTarget_get_target,fcfg_database_others.xcu) \
- $(call gb_XcuFilterTypesTarget_get_target,fcfg_database_types.xcu) \
+ $(if $(ENABLE_WASM_STRIP_DBACCESS),, \
+ $(call
gb_XcuFilterFiltersTarget_get_target,fcfg_database_filters.xcu) \
+ $(call
gb_XcuFilterOthersTarget_get_target,fcfg_database_others.xcu) \
+ $(call gb_XcuFilterTypesTarget_get_target,fcfg_database_types.xcu))
\
$(postprocess_MOD)/org/openoffice/Office/Common-base.xcu \
$(postprocess_MOD)/org/openoffice/Office/Embedding-base.xcu \
$(postprocess_MOD)/org/openoffice/Setup-base.xcu
@@ -67,8 +68,9 @@ postprocess_DEPS_draw := main
postprocess_FILES_draw := \
$(postprocess_XCS)/Office/UI/DrawWindowState.xcs \
$(postprocess_XCU)/Office/UI/DrawWindowState.xcu \
- $(call gb_XcuFilterFiltersTarget_get_target,fcfg_draw_filters.xcu) \
- $(call gb_XcuFilterTypesTarget_get_target,fcfg_draw_types.xcu) \
+ $(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
+ $(call gb_XcuFilterFiltersTarget_get_target,fcfg_draw_filters.xcu) \
+ $(call gb_XcuFilterTypesTarget_get_target,fcfg_draw_types.xcu)) \
$(postprocess_MOD)/org/openoffice/Office/Common-draw.xcu \
$(postprocess_MOD)/org/openoffice/Office/Embedding-draw.xcu \
$(postprocess_MOD)/org/openoffice/Setup-draw.xcu
@@ -94,8 +96,9 @@ postprocess_FILES_impress := \
$(postprocess_XCU)/Office/PresenterScreen.xcu \
$(postprocess_XCU)/Office/UI/Effects.xcu \
$(postprocess_XCU)/Office/UI/ImpressWindowState.xcu \
- $(call gb_XcuFilterFiltersTarget_get_target,fcfg_impress_filters.xcu) \
- $(call gb_XcuFilterTypesTarget_get_target,fcfg_impress_types.xcu) \
+ $(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
+ $(call
gb_XcuFilterFiltersTarget_get_target,fcfg_impress_filters.xcu) \
+ $(call gb_XcuFilterTypesTarget_get_target,fcfg_impress_types.xcu)) \
$(postprocess_MOD)/org/openoffice/Office/Common-impress.xcu \
$(postprocess_MOD)/org/openoffice/Office/Embedding-impress.xcu \
$(postprocess_MOD)/org/openoffice/Office/Jobs-impress.xcu \
@@ -331,8 +334,9 @@ postprocess_FILES_math := \
$(postprocess_XCS)/Office/UI/MathWindowState.xcs \
$(postprocess_XCU)/Office/UI/MathCommands.xcu \
$(postprocess_XCU)/Office/UI/MathWindowState.xcu \
- $(call gb_XcuFilterFiltersTarget_get_target,fcfg_math_filters.xcu) \
- $(call gb_XcuFilterTypesTarget_get_target,fcfg_math_types.xcu) \
+ $(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
+ $(call gb_XcuFilterFiltersTarget_get_target,fcfg_math_filters.xcu) \
+ $(call gb_XcuFilterTypesTarget_get_target,fcfg_math_types.xcu)) \
$(postprocess_MOD)/org/openoffice/Office/Common-math.xcu \
$(postprocess_MOD)/org/openoffice/Office/Embedding-math.xcu \
$(postprocess_MOD)/org/openoffice/Setup-math.xcu
