diff options
author | Armin Le Grand (Allotropia) <Armin.Le.Grand@me.com> | 2021-05-08 20:33:46 +0200 |
---|---|---|
committer | Armin Le Grand (Allotropia) <Armin.Le.Grand@me.com> | 2021-05-08 20:33:46 +0200 |
commit | f7d462b61c08de89ecded09eab5609fdf546ecd8 (patch) | |
tree | dbca796b60522575dd3c7f1babba6b0286ac71ae | |
parent | a1c508fc1c41b8ca1a13fe94f27e3f59fc1af269 (diff) |
WASM Removal of clucene
leaded to also remove:
helplinker -> remove
helpcompiler, xmlhelp -> remove
Change-Id: Ifb677dd5b50a116cb8c8856a24b61582906683e2
-rw-r--r-- | Repository.mk | 7 | ||||
-rw-r--r-- | RepositoryExternal.mk | 4 | ||||
-rw-r--r-- | RepositoryModule_build.mk | 13 | ||||
-rw-r--r-- | RepositoryModule_host.mk | 9 | ||||
-rw-r--r-- | desktop/Library_deployment.mk | 15 | ||||
-rw-r--r-- | desktop/Pagein_common.mk | 7 | ||||
-rw-r--r-- | desktop/source/deployment/deployment.component | 8 | ||||
-rw-r--r-- | desktop/source/deployment/deployment.extended.component | 30 | ||||
-rw-r--r-- | external/Module_external.mk | 7 | ||||
-rw-r--r-- | postprocess/Rdb_services.mk | 6 | ||||
-rwxr-xr-x | solenv/bin/native-code.py | 9 | ||||
-rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 4 | ||||
-rw-r--r-- | solenv/gbuild/gbuild.mk | 1 |
13 files changed, 96 insertions, 24 deletions
diff --git a/Repository.mk b/Repository.mk index 4bf5933cf3c2..f2695211dee5 100644 --- a/Repository.mk +++ b/Repository.mk @@ -342,6 +342,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ )) endif +ifneq ($(ENABLE_WASM_STRIP_CLUCENE),TRUE) +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ + $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \ +)) +endif + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ $(call gb_Helper_optional,AVMEDIA,avmedia) \ $(if $(filter MACOSX,$(OS)),\ @@ -385,7 +391,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ fsstorage \ fwk \ guesslang \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \ i18npool \ i18nsearch \ hyphen \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 27178925622b..03210fb3bb7a 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2874,9 +2874,11 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) +ifneq ($(ENABLE_WASM_STRIP_CLUCENE),TRUE) $(call gb_LinkTarget_add_libs,$(1),\ $(CLUCENE_LIBS) \ ) +endif endef @@ -2890,9 +2892,11 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) +ifneq ($(ENABLE_WASM_STRIP_CLUCENE),TRUE) $(call gb_LinkTarget_use_libraries,$(1),\ clucene \ ) +endif endef diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk index 3ea89f432c41..faa7328f5415 100644 --- a/RepositoryModule_build.mk +++ b/RepositoryModule_build.mk @@ -9,6 +9,15 @@ $(eval $(call gb_Module_Module,cross_toolset)) +ifneq ($(ENABLE_WASM_STRIP_CLUCENE),TRUE) +$(eval $(call gb_Module_add_moduledirs,cross_toolset,\ + $(call gb_Helper_optional_for_host,DESKTOP, \ + helpcompiler \ + xmlhelp \ + ) \ +)) +endif + $(eval $(call gb_Module_add_moduledirs,cross_toolset,\ basegfx \ binaryurp \ @@ -87,10 +96,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\ xmloff \ xmlscript \ ) \ - $(call gb_Helper_optional_for_host,DESKTOP, \ - helpcompiler \ - xmlhelp \ - ) \ $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ )) diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 2830e69f166a..696dded65af3 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -35,6 +35,13 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ )) endif +ifneq ($(ENABLE_WASM_STRIP_CLUCENE),TRUE) +$(eval $(call gb_Module_add_moduledirs,libreoffice,\ + $(call gb_Helper_optional,DESKTOP,helpcompiler) \ + $(call gb_Helper_optional,DESKTOP,$(if $(DISABLE_DYNLOADING),,xmlhelp)) \ +)) +endif + $(eval $(call gb_Module_add_moduledirs,libreoffice,\ accessibility \ android \ @@ -71,7 +78,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ formula \ $(call gb_Helper_optional,DESKTOP,fpicker) \ framework \ - $(call gb_Helper_optional,DESKTOP,helpcompiler) \ $(call gb_Helper_optional,HELP,helpcontent2) \ hwpfilter \ i18nlangtag \ @@ -159,7 +165,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ writerfilter \ writerperfect \ xmerge \ - $(call gb_Helper_optional,DESKTOP,$(if $(DISABLE_DYNLOADING),,xmlhelp)) \ xmloff \ xmlreader \ xmlscript \ diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk index fcf29882879c..2dc6d4c2d742 100644 --- a/desktop/Library_deployment.mk +++ b/desktop/Library_deployment.mk @@ -39,6 +39,17 @@ $(eval $(call gb_Library_use_libraries,deployment,\ $(eval $(call gb_Library_set_componentfile,deployment,desktop/source/deployment/deployment)) +ifneq ($(ENABLE_WASM_STRIP_CLUCENE),TRUE) +$(eval $(call gb_Library_set_componentfile,deployment,desktop/source/deployment/deployment.extended)) +endif + +ifneq ($(ENABLE_WASM_STRIP_CLUCENE),TRUE) +$(eval $(call gb_Library_add_exception_objects,deployment,\ + desktop/source/deployment/registry/help/dp_help \ + desktop/source/deployment/registry/component/dp_component \ +)) +endif + $(eval $(call gb_Library_add_exception_objects,deployment,\ desktop/source/deployment/dp_log \ desktop/source/deployment/dp_persmap \ @@ -51,7 +62,6 @@ $(eval $(call gb_Library_add_exception_objects,deployment,\ desktop/source/deployment/manager/dp_managerfac \ desktop/source/deployment/manager/dp_properties \ desktop/source/deployment/registry/component/dp_compbackenddb \ - desktop/source/deployment/registry/component/dp_component \ desktop/source/deployment/registry/configuration/dp_configuration \ desktop/source/deployment/registry/configuration/dp_configurationbackenddb \ desktop/source/deployment/registry/dp_backend \ @@ -59,7 +69,6 @@ $(eval $(call gb_Library_add_exception_objects,deployment,\ desktop/source/deployment/registry/dp_registry \ desktop/source/deployment/registry/executable/dp_executable \ desktop/source/deployment/registry/executable/dp_executablebackenddb \ - desktop/source/deployment/registry/help/dp_help \ desktop/source/deployment/registry/help/dp_helpbackenddb \ desktop/source/deployment/registry/package/dp_extbackenddb \ desktop/source/deployment/registry/package/dp_package \ @@ -71,11 +80,13 @@ $(eval $(call gb_Library_add_exception_objects,deployment,\ )) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) +ifneq ($(ENABLE_WASM_STRIP_CLUCENE),TRUE) $(eval $(call gb_Library_use_libraries,deployment,\ helplinker \ )) endif +endif # vim: set ts=4 sw=4 et: diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk index d0a0e689c2d2..96d5fe49f919 100644 --- a/desktop/Pagein_common.mk +++ b/desktop/Pagein_common.mk @@ -9,6 +9,12 @@ $(eval $(call gb_Pagein_Pagein,common)) +ifneq ($(ENABLE_WASM_STRIP_CLUCENE),TRUE) +$(eval $(call gb_Pagein_add_objects,common,\ + helplinker \ +)) +endif + # sorted in approx. reverse load order (ld.so.1) $(eval $(call gb_Pagein_add_objects,common,\ $(if $(MERGELIBS),merged) \ @@ -56,7 +62,6 @@ $(eval $(call gb_Pagein_add_objects,common,\ svt \ spl \ avmedia \ - helplinker \ sax \ fsstorage \ desktopbe1 \ diff --git a/desktop/source/deployment/deployment.component b/desktop/source/deployment/deployment.component index f7a481bf43c9..79c966deadc0 100644 --- a/desktop/source/deployment/deployment.component +++ b/desktop/source/deployment/deployment.component @@ -38,10 +38,6 @@ constructor="com_sun_star_comp_deployment_ProgressLog_get_implementation"> <service name="com.sun.star.comp.deployment.ProgressLog"/> </implementation> - <implementation name="com.sun.star.comp.deployment.component.PackageRegistryBackend" - constructor="com_sun_star_comp_deployment_component_PackageRegistryBackend_get_implementation"> - <service name="com.sun.star.deployment.PackageRegistryBackend"/> - </implementation> <implementation name="com.sun.star.comp.deployment.configuration.PackageRegistryBackend" constructor="com_sun_star_comp_deployment_configuration_PackageRegistryBackend_get_implementation"> <service name="com.sun.star.deployment.PackageRegistryBackend"/> @@ -50,10 +46,6 @@ constructor="com_sun_star_comp_deployment_executable_PackageRegistryBackend_get_implementation"> <service name="com.sun.star.deployment.PackageRegistryBackend"/> </implementation> - <implementation name="com.sun.star.comp.deployment.help.PackageRegistryBackend" - constructor="com_sun_star_comp_deployment_help_PackageRegistryBackend_get_implementation"> - <service name="com.sun.star.deployment.PackageRegistryBackend"/> - </implementation> <implementation name="com.sun.star.comp.deployment.script.PackageRegistryBackend" constructor="com_sun_star_comp_deployment_script_PackageRegistryBackend_get_implementation"> <service name="com.sun.star.deployment.PackageRegistryBackend"/> diff --git a/desktop/source/deployment/deployment.extended.component b/desktop/source/deployment/deployment.extended.component new file mode 100644 index 000000000000..8d0b70a9c028 --- /dev/null +++ b/desktop/source/deployment/deployment.extended.component @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> + +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.deployment.component.PackageRegistryBackend" + constructor="com_sun_star_comp_deployment_component_PackageRegistryBackend_get_implementation"> + <service name="com.sun.star.deployment.PackageRegistryBackend"/> + </implementation> + <implementation name="com.sun.star.comp.deployment.help.PackageRegistryBackend" + constructor="com_sun_star_comp_deployment_help_PackageRegistryBackend_get_implementation"> + <service name="com.sun.star.deployment.PackageRegistryBackend"/> + </implementation> +</component> diff --git a/external/Module_external.mk b/external/Module_external.mk index 4566d825301c..6828ad3a0317 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -13,6 +13,12 @@ ifeq ($(COM),MSC) $(eval $(call gb_Module_add_moduledir,external,msc-externals)) endif +ifneq ($(ENABLE_WASM_STRIP_CLUCENE),TRUE) +$(eval $(call gb_Module_add_moduledirs,external,\ + $(call gb_Helper_optional,CLUCENE,clucene) \ +)) +endif + $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,XMLSEC,xmlsec) \ $(call gb_Helper_optional,ABW,libabw) \ @@ -25,7 +31,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,CAIRO,cairo) \ $(call gb_Helper_optional,CDR,libcdr) \ $(call gb_Helper_optional,OPENCL,clew) \ - $(call gb_Helper_optional,CLUCENE,clucene) \ $(call gb_Helper_optional,LIBCMIS,libcmis) \ $(call gb_Helper_optional,COINMP,coinmp) \ $(call gb_Helper_optional,CPPUNIT,cppunit) \ diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index e23412a74774..173faac8cde7 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -83,6 +83,12 @@ $(eval $(call gb_Rdb_add_components,services,\ )) endif +ifneq ($(ENABLE_WASM_STRIP_CLUCENE),TRUE) +$(eval $(call gb_Rdb_add_components,services,\ + desktop/source/deployment/deployment.extended \ +)) +endif + $(eval $(call gb_Rdb_add_components,services,\ animations/source/animcore/animcore \ cui/util/cui \ diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 7c1a45e19422..63e6c4dcfd2b 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -619,14 +619,15 @@ draw_constructor_list = [ "com_sun_star_animations_SequenceTimeContainer_get_implementation", "com_sun_star_animations_TransitionFilter_get_implementation", # desktop/source/deployment/deployment.component + ("desktop/source/deployment/deployment.component", "#ifndef ENABLE_WASM_STRIP_CLUCENE"), "com_sun_star_comp_deployment_ExtensionManager_get_implementation", "com_sun_star_comp_deployment_PackageInformationProvider_get_implementation", "com_sun_star_comp_deployment_PackageManagerFactory_get_implementation", "com_sun_star_comp_deployment_ProgressLog_get_implementation", - "com_sun_star_comp_deployment_component_PackageRegistryBackend_get_implementation", + ("com_sun_star_comp_deployment_component_PackageRegistryBackend_get_implementation", "#ifndef ENABLE_WASM_STRIP_CLUCENE"), "com_sun_star_comp_deployment_configuration_PackageRegistryBackend_get_implementation", "com_sun_star_comp_deployment_executable_PackageRegistryBackend_get_implementation", - "com_sun_star_comp_deployment_help_PackageRegistryBackend_get_implementation", + ("com_sun_star_comp_deployment_help_PackageRegistryBackend_get_implementation", "#ifndef ENABLE_WASM_STRIP_CLUCENE"), "com_sun_star_comp_deployment_script_PackageRegistryBackend_get_implementation", "com_sun_star_comp_deployment_sfwk_PackageRegistryBackend_get_implementation", # embedded/source/msole/emboleobj.windows.component @@ -711,12 +712,12 @@ desktop_constructor_list = [ "com_sun_star_comp_configuration_DefaultProvider_get_implementation", "com_sun_star_comp_configuration_ReadOnlyAccess_get_implementation", "com_sun_star_comp_configuration_ReadWriteAccess_get_implementation", - "com_sun_star_comp_deployment_component_PackageRegistryBackend_get_implementation", + ("com_sun_star_comp_deployment_component_PackageRegistryBackend_get_implementation", "#ifndef ENABLE_WASM_STRIP_CLUCENE"), "com_sun_star_comp_deployment_configuration_PackageRegistryBackend_get_implementation", "com_sun_star_comp_deployment_executable_PackageRegistryBackend_get_implementation", "com_sun_star_comp_deployment_ExtensionManager_get_implementation", "com_sun_star_comp_deployment_ExtensionManager_get_implementation", - "com_sun_star_comp_deployment_help_PackageRegistryBackend_get_implementation", + ("com_sun_star_comp_deployment_help_PackageRegistryBackend_get_implementation","#ifndef ENABLE_WASM_STRIP_CLUCENE"), "com_sun_star_comp_deployment_PackageManagerFactory_get_implementation", "com_sun_star_comp_deployment_PackageManagerFactory_get_implementation", "com_sun_star_comp_deployment_ProgressLog_get_implementation", diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 2f18fbb8ce6e..0ff2f6dcaaa0 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -43,7 +43,9 @@ MERGE_LIBRARY_LIST := \ fwk \ $(if $(filter WNT,$(OS)),gdipluscanvas) \ guesslang \ - $(call gb_Helper_optional,DESKTOP,helplinker) \ + $(call gb_Helper_optional,DESKTOP, \ + $(if $(ENABLE_WASM_STRIP_CLUCENE),, \ + helplinker)) \ hyphen \ i18nsearch \ i18npool \ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index bfe010372a9c..8951ce56dbab 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -229,6 +229,7 @@ gb_GLOBALDEFS += -DENABLE_WASM_STRIP_PINGUSER gb_GLOBALDEFS += -DENABLE_WASM_STRIP_RECENT gb_GLOBALDEFS += -DENABLE_WASM_STRIP_CHART gb_GLOBALDEFS += -DENABLE_WASM_STRIP_CANVAS +gb_GLOBALDEFS += -DENABLE_WASM_STRIP_CLUCENE endif ifeq ($(gb_ENABLE_DBGUTIL),$(true)) |