[Libreoffice-commits] core.git: Branch 'feature/wasm' - config_host.mk.in Repository.mk solenv/gbuild

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

 Repository.mk           |   12 +++++++++++-
 config_host.mk.in       |    1 +
 solenv/gbuild/gbuild.mk |    1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 4a09f57c132c7957eb922063500964e2fd1bf5a5
Author:     Armin Le Grand (Allotropia) <Armin.Le.Grand at me.com>
AuthorDate: Mon May 17 15:56:44 2021 +0200
Commit:     Armin Le Grand (Allotropia) <Armin.Le.Grand at me.com>
CommitDate: Mon May 17 15:58:40 2021 +0200

    Wasm strip: remove UcpHelp
    
    Change-Id: I0900835c9b155571f524b5d9fd1b4227bc0670f3

diff --git a/Repository.mk b/Repository.mk
index f4f1dd0964ea..7a58afee5cf9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -23,9 +23,14 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 ))
 endif
 
+ifneq ($(ENABLE_WASM_STRIP_CLUCENE),TRUE)
 $(eval $(call gb_Helper_register_executables,NONE, \
 	HelpIndexer \
 	HelpLinker \
+))
+endif
+
+$(eval $(call gb_Helper_register_executables,NONE, \
 	bestreversemap \
 	cfgex \
 	concat-deps \
@@ -633,6 +638,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 ))
 endif
 
+ifneq ($(DENABLE_WASM_STRIP_UCPHELP),TRUE)
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
+	ucpchelp1 \
+))
+endif
+
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 	$(if $(ENABLE_GSTREAMER_1_0),avmediagst) \
 	$(if $(filter WNT,$(OS)),avmediawin) \
@@ -669,7 +680,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 	$(if $(WITH_WEBDAV),ucpdav1) \
 	ucpfile1 \
 	ucpftp1 \
-	ucpchelp1 \
 	ucphier1 \
 	ucppkg1 \
 	unopkgapp \
diff --git a/config_host.mk.in b/config_host.mk.in
index 39ed1b11e259..48a55d6b9a2c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -211,6 +211,7 @@ export ENABLE_WASM_STRIP_CANVAS=@ENABLE_WASM_STRIP@
 export ENABLE_WASM_STRIP_CLUCENE=@ENABLE_WASM_STRIP@
 export ENABLE_WASM_STRIP_DBACCESS=@ENABLE_WASM_STRIP@
 export ENABLE_WASM_STRIP_ACCESSIBILITY=@ENABLE_WASM_STRIP@
+export ENABLE_WASM_STRIP_UCPHELP=@ENABLE_WASM_STRIP@
 export ENABLE_WERROR=@ENABLE_WERROR@
 export ENDIANNESS=@ENDIANNESS@
 export EPM=@EPM@
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 376048a06399..017b2e6d600d 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -232,6 +232,7 @@ gb_GLOBALDEFS += -DENABLE_WASM_STRIP_CANVAS
 gb_GLOBALDEFS += -DENABLE_WASM_STRIP_CLUCENE
 gb_GLOBALDEFS += -DENABLE_WASM_STRIP_DBACCESS
 gb_GLOBALDEFS += -DENABLE_WASM_STRIP_ACCESSIBILITY
+gb_GLOBALDEFS += -DENABLE_WASM_STRIP_UCPHELP
 endif
 
 ifeq ($(gb_ENABLE_DBGUTIL),$(true))