diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-19 07:55:40 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-06 19:38:29 +0100 |
| commit | 1c9a40299d328c78c035ca63ccdf22c5c669a03b (patch) | |
| tree | ce32754685a0b147ffb701efbbcaa24fa7e36083 /Makefile.gbuild | |
| parent | ba8b3751fa184c04b9dde4c371b7902e0a9271ff (diff) | |
gbuild: create services.rdb from built components
... and introduce the --enable-services-rdb-from-build option.
Currently the build handles global build options redundant
in a few places:
* in Repository*mk + modules - the "real" build dependencies
* the full services.rdb generation
* the static UNO constructor map generation
Also the component files don't reflect the really built components
and so the RDB services generation must handle the whole options
to select the correct components.
So this optionally replaces the latter two by generating the list
of components and it's constructors from the build itself. As a
consequence, component files must now be split, so they reflect
the real components in the libraries, otherwise the static
constructor list will have missing symbols. IMHO this is more
natural, as it happens in the same place already handling these
build options for the sourcecode.
This also adds a convenience helper to add multiple component
files: gb_Library_set_componentfiles
This is WIP and currently just works for the stripped WASM build,
which introduces many more split component files in later patches.
It also explicitly filters the gb_Rdb__URECOMPONENTS and the
CppunitTest related components from the services.rdb. Maybe there
is a good way to do this properly.
Change-Id: I1b38a6f2c1e5221f18d7e5e756c30263b555d962
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126185
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'Makefile.gbuild')
| -rw-r--r-- | Makefile.gbuild | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.gbuild b/Makefile.gbuild index 9e7f205e22d4..db049264f65d 100644 --- a/Makefile.gbuild +++ b/Makefile.gbuild @@ -24,6 +24,11 @@ ifneq (,$(DISABLE_DYNLOADING)) $(if $(gb_LinkTarget__Lock),$(shell rm -f $(gb_LinkTarget__Lock))) endif +ifeq ($(ENABLE_SERVICES_RDB_FROM_BUILD),TRUE) +$(foreach comp,$(filter-out $(gb_Rdb__URECOMPONENTS),$(gb_ComponentTarget__ALLCOMPONENTS)), \ + $(eval $(call gb_Rdb_add_components,services,$(comp)))) +endif + upload-symbols: bin/upload_symbols.py $(WORKDIR)/symbols.zip $(BREAKPAD_SYMBOL_CONFIG) "$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX)$(LIBO_VERSION_SUFFIX_SUFFIX)" |