Make .component files directly usable within UNO_SERVICES.

* solenv/bin/createcomponent.xslt simply surrounds it output by <components>.
* solenv/gbuild/CppunitTest.mk got new functions
gb_CppunitTest_add[_old]_component[s] (like their gb_RdbTarget_ predecessors).
* This obsoleted current uses of solenv/gbuild/RdbTarget.mk, which also does not
work currently, as it catenates the input component files instead of passing
them through packcomponents.xslt (which now takes care about the surrounding
<components> in the input).  In the future, it will likely be combined with the
recently added solenv/gbuild/ComponentsTarget.mk.

4 files changed, 34 insertions, 42 deletions

diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 193ef5c52dd4..b708aa9d3dc9 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -88,8 +88,37 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sd_filters_test,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_service_rdbs,sd_filters_test,\
-    sd_filters_test \
+$(eval $(call gb_CppunitTest_add_components,sd_filters_test,\
+    basic/util/sb \
+    comphelper/util/comphelp \
+    dbaccess/util/dba \
+    fileaccess/source/fileacc \
+    filter/source/config/cache/filterconfig1 \
+    forms/util/frm \
+    framework/util/fwk \
+    i18npool/util/i18npool \
+    oox/util/oox \
+    package/source/xstor/xstor \
+    package/util/package2 \
+    sax/source/expatwrap/expwrap \
+    sax/source/fastparser/fastsax \
+    sd/util/sd \
+    sd/util/sdfilt \
+    sfx2/util/sfx \
+    sot/util/sot \
+    toolkit/util/tk \
+    unotools/util/utl \
+    unoxml/source/rdf/unordf \
+    unoxml/source/service/unoxml \
+    xmlsecurity/util/xsec_fw \
+    xmlsecurity/util/xmlsecurity \
+))
+
+$(eval $(call gb_CppunitTest_add_old_components,sd_filters_test,\
+    configmgr \
+    ucb1 \
+    ucpfile1 \
+    ucptdoc1 \
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sd_filters_test,\
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index 69d3b3aa7b87..8b8d909d5410 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -86,8 +86,9 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sd_uimpress,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_service_rdbs,sd_uimpress,\
-    sd_uimpress \
+$(eval $(call gb_CppunitTest_add_components,sd_uimpress,\
+    framework/util/fwk \
+    i18npool/util/i18npool \
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sd_uimpress,\
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index f65fcc7bdea8..796deb5b2c9c 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -44,8 +44,6 @@ ifneq ($(OS),DRAGONFLY)
 $(eval $(call gb_Module_add_check_targets,sd,\
     CppunitTest_sd_uimpress \
     CppunitTest_sd_filters_test \
-    RdbTarget_sd_uimpress \
-	RdbTarget_sd_filters_test \
 ))
 endif
 
diff --git a/sd/RdbTarget_sd_uimpress.mk b/sd/RdbTarget_sd_uimpress.mk
deleted file mode 100644
index 9265695f3cfe..000000000000
--- a/sd/RdbTarget_sd_uimpress.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_RdbTarget_RdbTarget,sd_uimpress))
-
-$(eval $(call gb_RdbTarget_add_components,sd_uimpress,\
-    framework/util/fwk \
-    i18npool/util/i18npool \
-))
-
-# vim: set noet sw=4 ts=4: