[Libreoffice-commits] core.git: Branch 'feature/wasm' - config_host.mk.in lingucomponent/Library_guesslang.mk lingucomponent/Module_lingucomponent.mk postprocess/Rdb_services.mk Repository.mk solenv/bin solenv/gbuild

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

 Repository.mk                           |    7 ++++++-
 config_host.mk.in                       |    1 +
 lingucomponent/Library_guesslang.mk     |    7 ++++++-
 lingucomponent/Module_lingucomponent.mk |    5 +++++
 postprocess/Rdb_services.mk             |    7 ++++++-
 solenv/bin/native-code.py               |    4 ++--
 solenv/gbuild/gbuild.mk                 |    1 +
 7 files changed, 27 insertions(+), 5 deletions(-)

New commits:
commit 302a6f6f777a1394e439807f3ef034e7edc45682
Author:     Armin Le Grand (Allotropia) <Armin.Le.Grand at me.com>
AuthorDate: Thu May 20 16:45:26 2021 +0200
Commit:     Armin Le Grand (Allotropia) <Armin.Le.Grand at me.com>
CommitDate: Thu May 20 16:45:26 2021 +0200

    Wasm LanguageGuess optional removal
    
    Change-Id: Ida6a6357be9a92c473c292142575c9e111c33cca

diff --git a/Repository.mk b/Repository.mk
index 7a58afee5cf9..700d61a2e55a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -359,6 +359,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 ))
 endif
 
+ifneq ($(ENABLE_WASM_STRIP_GUESSLANG),TRUE)
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+	guesslang \
+))
+endif
+
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	$(call gb_Helper_optional,AVMEDIA,avmedia) \
 	$(if $(filter MACOSX,$(OS)),\
@@ -401,7 +407,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	frm \
 	fsstorage \
 	fwk \
-	guesslang \
 	i18npool \
 	i18nsearch \
 	hyphen \
diff --git a/config_host.mk.in b/config_host.mk.in
index 59acfac79a55..f723a6559a1e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -214,6 +214,7 @@ export ENABLE_WASM_STRIP_ACCESSIBILITY=@ENABLE_WASM_STRIP@
 export ENABLE_WASM_STRIP_UCPHELP=@ENABLE_WASM_STRIP@
 export ENABLE_WASM_STRIP_EPUB=@ENABLE_WASM_STRIP@
 export ENABLE_WASM_STRIP_LOCALES=@ENABLE_WASM_STRIP@
+export ENABLE_WASM_STRIP_GUESSLANG=@ENABLE_WASM_STRIP@
 export ENABLE_WERROR=@ENABLE_WERROR@
 export ENDIANNESS=@ENDIANNESS@
 export EPM=@EPM@
diff --git a/lingucomponent/Library_guesslang.mk b/lingucomponent/Library_guesslang.mk
index 55f9225722a5..3363e6aa1831 100644
--- a/lingucomponent/Library_guesslang.mk
+++ b/lingucomponent/Library_guesslang.mk
@@ -12,10 +12,15 @@ $(eval $(call gb_Library_Library,guesslang))
 
 $(eval $(call gb_Library_set_componentfile,guesslang,lingucomponent/source/languageguessing/guesslang))
 
+ifneq ($(ENABLE_WASM_STRIP_GUESSLANG),TRUE)
 $(eval $(call gb_Library_use_externals,guesslang,\
-	boost_headers \
 	libexttextcat \
 ))
+endif
+
+$(eval $(call gb_Library_use_externals,guesslang,\
+	boost_headers \
+))
 
 $(eval $(call gb_Library_use_sdk_api,guesslang))
 
diff --git a/lingucomponent/Module_lingucomponent.mk b/lingucomponent/Module_lingucomponent.mk
index 2bde5d5391e5..1a22d9bbf143 100644
--- a/lingucomponent/Module_lingucomponent.mk
+++ b/lingucomponent/Module_lingucomponent.mk
@@ -10,8 +10,13 @@
 
 $(eval $(call gb_Module_Module,lingucomponent))
 
+ifneq ($(ENABLE_WASM_STRIP_GUESSLANG),TRUE)
 $(eval $(call gb_Module_add_targets,lingucomponent,\
 	Library_guesslang \
+))
+endif
+
+$(eval $(call gb_Module_add_targets,lingucomponent,\
 	Library_hyphen \
 	Library_lnth \
 	$(if $(filter iOS MACOSX,$(OS)),Library_MacOSXSpell) \
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 85cf66a93073..be2cb9d54225 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -97,6 +97,12 @@ $(eval $(call gb_Rdb_add_components,services,\
 ))
 endif
 
+ifneq ($(ENABLE_WASM_STRIP_GUESSLANG),TRUE)
+$(eval $(call gb_Rdb_add_components,services,\
+	lingucomponent/source/languageguessing/guesslang \
+))
+endif
+
 $(eval $(call gb_Rdb_add_components,services,\
 	animations/source/animcore/animcore \
 	cui/util/cui \
@@ -118,7 +124,6 @@ $(eval $(call gb_Rdb_add_components,services,\
 	$(if $(filter MACOSX,$(OS)),fpicker/source/aqua/fps_aqua) \
 	hwpfilter/source/hwp \
 	lingucomponent/source/hyphenator/hyphen/hyphen \
-	lingucomponent/source/languageguessing/guesslang \
 	lingucomponent/source/spellcheck/spell/spell \
 	lingucomponent/source/thesaurus/libnth/lnth \
 	lingucomponent/source/numbertext/numbertext \
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index a9bdfab0781e..d31d7283479d 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -283,7 +283,7 @@ core_constructor_list = [
 # lingucomponent/source/thesaurus/libnth/lnth.component
     "lingucomponent_Thesaurus_get_implementation",
     "lingucomponent_SpellChecker_get_implementation",
-    "lingucomponent_LangGuess_get_implementation",
+    ("lingucomponent_LangGuess_get_implementation", "#ifndef ENABLE_WASM_STRIP_GUESSLANG"),
     "lingucomponent_Hyphenator_get_implementation",
 # package/source/xstor/xstor.component
     "package_OStorageFactory_get_implementation",
@@ -844,7 +844,7 @@ desktop_constructor_list = [
     "i18npool_Collator_Unicode_get_implementation",
     "IndexedPropertyValuesContainer_get_implementation",
     "lingucomponent_Hyphenator_get_implementation",
-    "lingucomponent_LangGuess_get_implementation",
+    ("lingucomponent_LangGuess_get_implementation", "#ifndef ENABLE_WASM_STRIP_GUESSLANG"),
     "lingucomponent_SpellChecker_get_implementation",
     "lingucomponent_Thesaurus_get_implementation",
     "linguistic_DicList_get_implementation",
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index c2aae611630c..3b3b41e575d0 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -235,6 +235,7 @@ gb_GLOBALDEFS += -DENABLE_WASM_STRIP_ACCESSIBILITY
 gb_GLOBALDEFS += -DENABLE_WASM_STRIP_UCPHELP
 gb_GLOBALDEFS += -DENABLE_WASM_STRIP_EPUB
 gb_GLOBALDEFS += -DENABLE_WASM_STRIP_LOCALES
+gb_GLOBALDEFS += -DENABLE_WASM_STRIP_GUESSLANG
 endif
 
 ifeq ($(gb_ENABLE_DBGUTIL),$(true))