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.

3 files changed, 18 insertions, 54 deletions

diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk
index 0adf9566c2a9..6a12bebb2853 100644
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -84,10 +84,26 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,starmath_qa_cppunit,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_service_rdbs,starmath_qa_cppunit,\
-    starmath_qa_cppunit \
+$(eval $(call gb_CppunitTest_add_components,starmath_qa_cppunit,\
+    framework/util/fwk \
+    i18npool/util/i18npool \
+    toolkit/util/tk \
+    sfx2/util/sfx \
 ))
 
+$(eval $(call gb_CppunitTest_add_old_components,starmath_qa_cppunit,\
+    component/vcl/vcl \
+    configmgr \
+    mcnttype \
+))
+
+ifeq ($(strip $(OS)),WNT)
+$(eval $(call gb_CppunitTest_add_old_components,starmath_qa_cppunit,\
+    ftransl \
+    sysdtrans \
+))
+endif
+
 $(eval $(call gb_CppunitTest_set_args,starmath_qa_cppunit,\
     --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
 ))
diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk
index 6da29aa96e2d..7f8554c07a66 100644
--- a/starmath/Module_starmath.mk
+++ b/starmath/Module_starmath.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Module_add_targets,starmath,\
 # was this missing accidentally?
 #$(eval $(call gb_Module_add_check_targets,starmath,\
     CppunitTest_starmath_qa_cppunit \
-    RdbTarget_starmath_qa_cppunit \
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,starmath,\
diff --git a/starmath/RdbTarget_starmath_qa_cppunit.mk b/starmath/RdbTarget_starmath_qa_cppunit.mk
deleted file mode 100644
index 64b7baaf6aea..000000000000
--- a/starmath/RdbTarget_starmath_qa_cppunit.mk
+++ /dev/null
@@ -1,51 +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,starmath_qa_cppunit))
-
-$(eval $(call gb_RdbTarget_add_components,starmath_qa_cppunit,\
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    toolkit/util/tk \
-    sfx2/util/sfx \
-))
-
-$(eval $(call gb_RdbTarget_add_old_components,starmath_qa_cppunit,\
-    component/vcl/vcl \
-    configmgr \
-    mcnttype \
-))
-
-ifeq ($(strip $(OS)),WNT)
-$(eval $(call gb_RdbTarget_add_old_components,starmath_qa_cppunit,\
-    ftransl \
-    sysdtrans \
-))
-endif
-
-# vim: set noet sw=4 ts=4: