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, 6 insertions, 47 deletions

diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
index a6c841cb9992..bf633e4642c3 100644
--- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
+++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
@@ -63,8 +63,12 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,hwpfilter_test_hwpfilter,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_service_rdbs,hwpfilter_test_hwpfilter,\
-    hwpfilter_test_hwpfilter \
+$(eval $(call gb_CppunitTest_add_components,hwpfilter_test_hwpfilter,\
+    hwpfilter/source/hwp \
+))
+$(eval $(call gb_CppunitTest_add_old_components,hwpfilter_test_hwpfilter,\
+    ucb1 \
+    ucpfile1 \
 ))
 
 $(eval $(call gb_CppunitTest_set_args,hwpfilter_test_hwpfilter,\
diff --git a/hwpfilter/Module_hwpfilter.mk b/hwpfilter/Module_hwpfilter.mk
index b0ebe0bb14da..95390e57b107 100644
--- a/hwpfilter/Module_hwpfilter.mk
+++ b/hwpfilter/Module_hwpfilter.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Module_add_targets,hwpfilter,\
 
 $(eval $(call gb_Module_add_check_targets,hwpfilter,\
     CppunitTest_hwpfilter_test_hwpfilter \
-    RdbTarget_hwpfilter_test_hwpfilter \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/hwpfilter/RdbTarget_hwpfilter_test_hwpfilter.mk b/hwpfilter/RdbTarget_hwpfilter_test_hwpfilter.mk
deleted file mode 100644
index 119439b239b6..000000000000
--- a/hwpfilter/RdbTarget_hwpfilter_test_hwpfilter.mk
+++ /dev/null
@@ -1,44 +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
-#       Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#       Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com>
-#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
-#
-# 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,hwpfilter_test_hwpfilter))
-
-$(eval $(call gb_RdbTarget_add_components,hwpfilter_test_hwpfilter,\
-    hwpfilter/source/hwp,\
-))
-
-$(eval $(call gb_RdbTarget_add_old_components,hwpfilter_test_hwpfilter,\
-    ucb1 \
-    ucpfile1 \
-))
-
-# vim: set noet sw=4 ts=4: