[Libreoffice-commits] core.git: Branch 'feature/wasm' - cui/Library_cui.mk Repository.mk vcl/Module_vcl.mk

[Armin Le Grand (Allotropia) (via logerrit)]

 Repository.mk      |    7 ++++++-
 cui/Library_cui.mk |    7 ++++++-
 vcl/Module_vcl.mk  |    7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

New commits:
commit 68e5f972b1a6df0bff288e5609b7d71781a73f3b
Author:     Armin Le Grand (Allotropia) <Armin.Le.Grand at me.com>
AuthorDate: Mon May 3 17:10:13 2021 +0200
Commit:     Armin Le Grand (Allotropia) <Armin.Le.Grand at me.com>
CommitDate: Mon May 3 17:10:13 2021 +0200

    Deeper TipOfTheDay optional removal
    
    Change-Id: I4206cde761f0ed0aa559d257cf0ad1564ede3bd7

diff --git a/Repository.mk b/Repository.mk
index 1bbffc768dab..67c8a38528de 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -876,6 +876,12 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	) \
 ))
 
+ifneq ($(ENABLE_WASM_STRIP),TRUE)
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+	tipoftheday_images \
+))
+endif
+
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 	$(if $(SYSTEM_LIBEXTTEXTCAT),,libexttextcat_fingerprint) \
 	officecfg_misc \
@@ -959,7 +965,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 	wizards_basicusr \
 	wizards_properties \
 	wizards_wizardshare \
-	tipoftheday_images \
 	toolbarmode_images \
 	vcl_theme_definitions \
 	$(if $(filter WNT,$(OS)), \
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 01e2bd8cd191..a9b46a1b2b05 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -93,6 +93,12 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
 ))
 endif
 
+ifneq ($(ENABLE_WASM_STRIP),TRUE)
+$(eval $(call gb_Library_add_exception_objects,cui,\
+    cui/source/dialogs/tipofthedaydlg \
+))
+endif
+
 $(eval $(call gb_Library_add_exception_objects,cui,\
     cui/source/customize/acccfg \
     cui/source/customize/cfg \
@@ -128,7 +134,6 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
     cui/source/dialogs/hltpbase \
     cui/source/dialogs/hyphen \
     cui/source/dialogs/iconcdlg \
-    cui/source/dialogs/tipofthedaydlg \
     cui/source/dialogs/insdlg \
     cui/source/dialogs/insrc \
     cui/source/dialogs/linkdlg \
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 2e2034d131f9..f147f963e32d 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -19,10 +19,15 @@
 
 $(eval $(call gb_Module_Module,vcl))
 
+ifneq ($(ENABLE_WASM_STRIP),TRUE)
+$(eval $(call gb_Module_add_targets,vcl,\
+    Package_tipoftheday \
+))
+endif
+
 $(eval $(call gb_Module_add_targets,vcl,\
     Library_vcl \
     Package_theme_definitions \
-    Package_tipoftheday \
     Package_toolbarmode \
     UIConfig_vcl \
     $(if $(filter WNT,$(OS)), \