officecfg/Configuration_officecfg.mk | 18 +++++++++++-------
postprocess/CustomTarget_registry.mk | 14 +++++++-------
2 files changed, 18 insertions(+), 14 deletions(-)
New commits:
commit 0d8d71ba986d6c3d4a460d980e2709b9051ba989
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Fri Feb 23 17:08:47 2024 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Fri Feb 23 20:58:56 2024 +0100
Emscripten: Filter out some configuration
...that was present in instdir/share/registry/res/registry_en-US.xcd but for
which the underlying instdir/share/registry/*.xcd files are not included in
static/CustomTarget_emscripten_fs_image.mk, so causing
> warn:configmgr:42:1:configmgr/source/xcuparser.cxx:292: unknown component
"org.openoffice.Office.PresentationMinimizer" in
"file:///instdir/program/../share/registry/res/registry_en-US.xcd"
etc. in the browser console. (This commit just hides those .xcu behind
ENABLE_WASM_STRIP_* for which localizations ended up in
instdir/share/registry/res/registry_en-US.xcd and caused the above
warnings. It
does not clean up the mess further. Also 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: I1781f5cb530fe251e63bcad456c2ab1735cf1b3a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163852
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/officecfg/Configuration_officecfg.mk
b/officecfg/Configuration_officecfg.mk
index aa4eec7b054c..57ac28bbed51 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -150,8 +150,9 @@ $(eval $(call
gb_Configuration_add_localized_datas,registry,officecfg/registry/d
) \
org/openoffice/Office/Common.xcu \
org/openoffice/Office/DataAccess.xcu \
- org/openoffice/Office/PresentationMinimizer.xcu \
- org/openoffice/Office/PresenterScreen.xcu \
+ $(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
+ org/openoffice/Office/PresentationMinimizer.xcu \
+ org/openoffice/Office/PresenterScreen.xcu) \
org/openoffice/Office/TableWizard.xcu \
org/openoffice/Office/UI.xcu \
org/openoffice/Office/Embedding.xcu \
@@ -178,14 +179,17 @@ $(eval $(call
gb_Configuration_add_localized_datas,registry,officecfg/registry/d
org/openoffice/Office/UI/DbBrowserWindowState.xcu \
org/openoffice/Office/UI/DbTableDataWindowState.xcu \
org/openoffice/Office/UI/DrawImpressCommands.xcu \
- org/openoffice/Office/UI/Effects.xcu \
+ $(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
+ org/openoffice/Office/UI/Effects.xcu) \
org/openoffice/Office/UI/GenericCommands.xcu \
- org/openoffice/Office/UI/MathCommands.xcu \
+ $(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
+ org/openoffice/Office/UI/MathCommands.xcu) \
org/openoffice/Office/UI/BasicIDEWindowState.xcu \
org/openoffice/Office/UI/CalcWindowState.xcu \
- org/openoffice/Office/UI/DrawWindowState.xcu \
- org/openoffice/Office/UI/ImpressWindowState.xcu \
- org/openoffice/Office/UI/MathWindowState.xcu \
+ $(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
+ org/openoffice/Office/UI/DrawWindowState.xcu \
+ org/openoffice/Office/UI/ImpressWindowState.xcu \
+ org/openoffice/Office/UI/MathWindowState.xcu) \
$(call gb_Helper_optional,REPORTBUILDER, \
org/openoffice/Office/UI/ReportCommands.xcu \
) \
diff --git a/postprocess/CustomTarget_registry.mk
b/postprocess/CustomTarget_registry.mk
index e7f5997984f8..8a503e39862a 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -67,8 +67,8 @@ postprocess_FILES_ctl := \
postprocess_DEPS_draw := main
postprocess_FILES_draw := \
$(postprocess_XCS)/Office/UI/DrawWindowState.xcs \
- $(postprocess_XCU)/Office/UI/DrawWindowState.xcu \
$(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
+ $(postprocess_XCU)/Office/UI/DrawWindowState.xcu \
$(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 \
@@ -92,11 +92,11 @@ postprocess_FILES_impress := \
$(postprocess_XCS)/Office/PresenterScreen.xcs \
$(postprocess_XCS)/Office/UI/Effects.xcs \
$(postprocess_XCS)/Office/UI/ImpressWindowState.xcs \
- $(postprocess_XCU)/Office/PresentationMinimizer.xcu \
- $(postprocess_XCU)/Office/PresenterScreen.xcu \
- $(postprocess_XCU)/Office/UI/Effects.xcu \
- $(postprocess_XCU)/Office/UI/ImpressWindowState.xcu \
$(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
+ $(postprocess_XCU)/Office/PresentationMinimizer.xcu \
+ $(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)) \
$(postprocess_MOD)/org/openoffice/Office/Common-impress.xcu \
@@ -332,9 +332,9 @@ postprocess_DEPS_math := main
postprocess_FILES_math := \
$(postprocess_XCS)/Office/UI/MathCommands.xcs \
$(postprocess_XCS)/Office/UI/MathWindowState.xcs \
- $(postprocess_XCU)/Office/UI/MathCommands.xcu \
- $(postprocess_XCU)/Office/UI/MathWindowState.xcu \
$(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
+ $(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)) \
$(postprocess_MOD)/org/openoffice/Office/Common-math.xcu \
