Generally determine Rdb content from gb_*_set_componentfile calls

...instead of by listing the content somewhat redundantly in the Rdb_*.mk
files, to avoid duplication of logic for components that are only built
conditionally (and thus should only be included conditionally in the
corresponding Rdb).  To achieve that, add an "rdb" parameter to
gb_ComponentTarget_ComponentTarget (and to the gb_*_set_componentfile macros
that internally call gb_ComponentTarget_ComponentTarget), which is used to make
the appropriate gb_Rdb_add_component call internally from within
gb_ComponentTarget_ComponentTarget.  (As a special case,
gb_CppunitTest_set_componentfile shall not call gb_Rdb_add_component, as that
has already been done by the corresponding gb_Library_set_componentfile call, so
allow the gb_ComponentTarget_ComponentTarget "rdb" parameter to be empty to
support that special case.)

Most Rdb_*.mk files are thus mostly empty now.  One exception is
i18npool/Rdb_saxparser.mk, which duplicates some of the Rdb_services content as
needed during the build in CustomTarget_i18npool/localedata.

1c9a40299d328c78c035ca63ccdf22c5c669a03b "gbuild: create services.rdb from built
components" had already tried to do something similar (in addition to other
things) under a new --enable-services-rdb-from-build option.  However, that
approach had four drawbacks that this approach here addresses (and which thus
partly reverts 1c9a40299d328c78c035ca63ccdf22c5c669a03b):

1  Rdb_services shall not contain the component files of all libraries that are
built.  While that commit filtered out the component files that go into
Rdb_ure/services (ure/Rdb_ure.mk), it failed to filter out the component files
that go into others like Rdb_postgresql-sdbc
(connectivity/Rdb_postgresql-sdbc.mk).

2  The code added by that commit to Makefile.gbuild codified the knowledge that
there is an Rdb_services, which is brittle.

3  The code added by that commit to solenv/gbuild/Rdb.mk codified the knowledge
(for gb_Rdb__URECOMPONENTS) that there is an Rdb_ure/services, which is brittle.

4  Introducing an --enable-services-rdb-from-build option needlessly provided
two different ways how the content of Rdb_services is assembled.

The changes done here would leave --enable-services-rdb-from-build as a
misnomer, as it no longer controls how Rdb_services is assembled.  I thus
renamed it to --enable-customtarget-components, as that is apparently what it
still does now.

Change-Id: Ia5e8df4b640146c77421fcec6daa11a9cd260265
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126577
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

13 files changed, 13 insertions, 13 deletions

diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk
index 79557890786c..38251aa313f0 100644
--- a/filter/Library_filterconfig.mk
+++ b/filter/Library_filterconfig.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,filterconfig))
 
-$(eval $(call gb_Library_set_componentfile,filterconfig,filter/source/config/cache/filterconfig1))
+$(eval $(call gb_Library_set_componentfile,filterconfig,filter/source/config/cache/filterconfig1,services))
 
 $(eval $(call gb_Library_use_external,filterconfig,boost_headers))
 
diff --git a/filter/Library_graphicfilter.mk b/filter/Library_graphicfilter.mk
index 110e9b4d8a13..34f9662d0aa1 100644
--- a/filter/Library_graphicfilter.mk
+++ b/filter/Library_graphicfilter.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,graphicfilter))
 
-$(eval $(call gb_Library_set_componentfile,graphicfilter,filter/source/graphic/graphicfilter))
+$(eval $(call gb_Library_set_componentfile,graphicfilter,filter/source/graphic/graphicfilter,services))
 
 $(eval $(call gb_Library_use_external,graphicfilter,boost_headers))
 
diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk
index 22c765f20d78..0429a6e31874 100644
--- a/filter/Library_msfilter.mk
+++ b/filter/Library_msfilter.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,msfilter))
 
-$(eval $(call gb_Library_set_componentfile,msfilter,filter/source/msfilter/msfilter))
+$(eval $(call gb_Library_set_componentfile,msfilter,filter/source/msfilter/msfilter,services))
 
 $(eval $(call gb_Library_use_external,msfilter,boost_headers))
 
diff --git a/filter/Library_odfflatxml.mk b/filter/Library_odfflatxml.mk
index 8ed2aa4ce199..176530035ddd 100644
--- a/filter/Library_odfflatxml.mk
+++ b/filter/Library_odfflatxml.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,odfflatxml))
 
-$(eval $(call gb_Library_set_componentfile,odfflatxml,filter/source/odfflatxml/odfflatxml))
+$(eval $(call gb_Library_set_componentfile,odfflatxml,filter/source/odfflatxml/odfflatxml,services))
 
 $(eval $(call gb_Library_use_sdk_api,odfflatxml))
 
diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk
index a7cb47a65231..23afd08b4595 100644
--- a/filter/Library_pdffilter.mk
+++ b/filter/Library_pdffilter.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,pdffilter))
 
-$(eval $(call gb_Library_set_componentfile,pdffilter,filter/source/pdf/pdffilter))
+$(eval $(call gb_Library_set_componentfile,pdffilter,filter/source/pdf/pdffilter,services))
 
 $(eval $(call gb_Library_use_external,pdffilter,boost_headers))
 
diff --git a/filter/Library_storagefd.mk b/filter/Library_storagefd.mk
index 938096ecef0f..4d2fd1dfeed7 100644
--- a/filter/Library_storagefd.mk
+++ b/filter/Library_storagefd.mk
@@ -11,7 +11,7 @@
 
 $(eval $(call gb_Library_Library,storagefd))
 
-$(eval $(call gb_Library_set_componentfile,storagefd,filter/source/storagefilterdetect/storagefd))
+$(eval $(call gb_Library_set_componentfile,storagefd,filter/source/storagefilterdetect/storagefd,services))
 
 $(eval $(call gb_Library_use_external,storagefd,boost_headers))
 
diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk
index 21318aa1fd03..07da0cc4a3cc 100644
--- a/filter/Library_svgfilter.mk
+++ b/filter/Library_svgfilter.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_Library_Library,svgfilter))
 
 $(eval $(call gb_Library_use_custom_headers,svgfilter,filter/source/svg))
 
-$(eval $(call gb_Library_set_componentfile,svgfilter,filter/source/svg/svgfilter))
+$(eval $(call gb_Library_set_componentfile,svgfilter,filter/source/svg/svgfilter,services))
 
 $(eval $(call gb_Library_add_defs,svgfilter,\
 	-DBOOST_ALL_NO_LIB \
diff --git a/filter/Library_t602filter.mk b/filter/Library_t602filter.mk
index 90f834e1238d..f8ad92b9680e 100644
--- a/filter/Library_t602filter.mk
+++ b/filter/Library_t602filter.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Library_set_include,t602filter,\
     -I$(SRCDIR)/filter/inc \
 ))
 
-$(eval $(call gb_Library_set_componentfile,t602filter,filter/source/t602/t602filter))
+$(eval $(call gb_Library_set_componentfile,t602filter,filter/source/t602/t602filter,services))
 
 $(eval $(call gb_Library_use_external,t602filter,boost_headers))
 
diff --git a/filter/Library_textfd.mk b/filter/Library_textfd.mk
index c6155f1e9876..d3318dcbdb35 100644
--- a/filter/Library_textfd.mk
+++ b/filter/Library_textfd.mk
@@ -11,7 +11,7 @@
 
 $(eval $(call gb_Library_Library,textfd))
 
-$(eval $(call gb_Library_set_componentfile,textfd,filter/source/textfilterdetect/textfd))
+$(eval $(call gb_Library_set_componentfile,textfd,filter/source/textfilterdetect/textfd,services))
 
 $(eval $(call gb_Library_use_external,textfd,boost_headers))
 
diff --git a/filter/Library_xmlfa.mk b/filter/Library_xmlfa.mk
index 147bed21d7c6..35a2dd9ff9b6 100644
--- a/filter/Library_xmlfa.mk
+++ b/filter/Library_xmlfa.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,xmlfa))
 
-$(eval $(call gb_Library_set_componentfile,xmlfa,filter/source/xmlfilteradaptor/xmlfa))
+$(eval $(call gb_Library_set_componentfile,xmlfa,filter/source/xmlfilteradaptor/xmlfa,services))
 
 $(eval $(call gb_Library_use_external,xmlfa,boost_headers))
 
diff --git a/filter/Library_xmlfd.mk b/filter/Library_xmlfd.mk
index 8ec02c3c0ff7..a5c1d190c8f7 100644
--- a/filter/Library_xmlfd.mk
+++ b/filter/Library_xmlfd.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,xmlfd))
 
-$(eval $(call gb_Library_set_componentfile,xmlfd,filter/source/xmlfilterdetect/xmlfd))
+$(eval $(call gb_Library_set_componentfile,xmlfd,filter/source/xmlfilterdetect/xmlfd,services))
 
 $(eval $(call gb_Library_use_external,xmlfd,boost_headers))
 
diff --git a/filter/Library_xsltdlg.mk b/filter/Library_xsltdlg.mk
index 737f79e7b225..fd5f480e7fa5 100644
--- a/filter/Library_xsltdlg.mk
+++ b/filter/Library_xsltdlg.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,xsltdlg))
 
-$(eval $(call gb_Library_set_componentfile,xsltdlg,filter/source/xsltdialog/xsltdlg))
+$(eval $(call gb_Library_set_componentfile,xsltdlg,filter/source/xsltdialog/xsltdlg,services))
 
 $(eval $(call gb_Library_use_external,xsltdlg,boost_headers))
 
diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk
index 92e2e11e2f64..42f426c945ea 100644
--- a/filter/Library_xsltfilter.mk
+++ b/filter/Library_xsltfilter.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,xsltfilter))
 
-$(eval $(call gb_Library_set_componentfile,xsltfilter,filter/source/xsltfilter/xsltfilter))
+$(eval $(call gb_Library_set_componentfile,xsltfilter,filter/source/xsltfilter/xsltfilter,services))
 
 $(eval $(call gb_Library_use_sdk_api,xsltfilter))