diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-02-23 15:32:12 +0100 |
|---|---|---|
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-02-23 20:58:40 +0100 |
| commit | 07deeedadda3d5d6b37b281c8d93060c1229ac7e (patch) | |
| tree | 9e67d005da10cf9d177664e11aba6a232e4eda27 /postprocess | |
| parent | 36de604067b5b76de90a09ab8a1760623c9a4afe (diff) | |
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.bergmann@allotropia.de>
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 22 |
1 files changed, 13 insertions, 9 deletions
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 |