diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-02-23 17:08:47 +0100 |
|---|---|---|
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-02-23 20:58:56 +0100 |
| commit | 0d8d71ba986d6c3d4a460d980e2709b9051ba989 (patch) | |
| tree | c851dbc160f4b611ea77336b953aa29ec2c69a17 /officecfg | |
| parent | 07deeedadda3d5d6b37b281c8d93060c1229ac7e (diff) | |
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.bergmann@allotropia.de>
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/Configuration_officecfg.mk | 18 |
1 files changed, 11 insertions, 7 deletions
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 \ ) \ |