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.

5 files changed, 30 insertions, 106 deletions

diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index 68087df11a2a..500405fd6206 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -80,8 +80,24 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sw_filters_test,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_service_rdbs,sw_filters_test,\
-    sw_filters_test \
+$(eval $(call gb_CppunitTest_add_components,sw_filters_test,\
+    sw/util/sw \
+    sw/util/msword \
+    forms/util/frm \
+    dbaccess/util/dba \
+    sfx2/util/sfx \
+    framework/util/fwk \
+    toolkit/util/tk \
+    unoxml/source/service/unoxml \
+    fileaccess/source/fileacc \
+    comphelper/util/comphelp \
+    i18npool/util/i18npool \
+	package/util/package2 \
+))
+
+$(eval $(call gb_CppunitTest_add_old_components,sw_filters_test,\
+    ucb1 \
+    ucpfile1 \
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sw_filters_test,\
diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk
index 42fe4eb9ff12..029088942fd9 100644
--- a/sw/CppunitTest_sw_swdoc_test.mk
+++ b/sw/CppunitTest_sw_swdoc_test.mk
@@ -94,8 +94,18 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sw_swdoc_test,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_service_rdbs,sw_swdoc_test,\
-    sw_swdoc_test \
+$(eval $(call gb_CppunitTest_add_components,sw_swdoc_test,\
+    sfx2/util/sfx \
+    framework/util/fwk \
+    unoxml/source/service/unoxml \
+    fileaccess/source/fileacc \
+    comphelper/util/comphelp \
+    i18npool/util/i18npool \
+))
+
+$(eval $(call gb_CppunitTest_add_old_components,sw_swdoc_test,\
+    ucb1 \
+    ucpfile1 \
 ))
 
 $(call gb_CppunitTest_get_target,sw_swdoc_test) : \
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 90d8a0c17d78..c66b92e37193 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -43,8 +43,6 @@ $(eval $(call gb_Module_add_targets,sw,\
 $(eval $(call gb_Module_add_check_targets,sw,\
     CppunitTest_sw_filters_test \
     CppunitTest_sw_swdoc_test \
-    RdbTarget_sw_filters_test \
-    RdbTarget_sw_swdoc_test \
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
diff --git a/sw/RdbTarget_sw_filters_test.mk b/sw/RdbTarget_sw_filters_test.mk
deleted file mode 100644
index 3fdee3c36a64..000000000000
--- a/sw/RdbTarget_sw_filters_test.mk
+++ /dev/null
@@ -1,53 +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
-#       Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 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,sw_filters_test))
-
-$(eval $(call gb_RdbTarget_add_components,sw_filters_test,\
-    sw/util/sw \
-    sw/util/msword \
-    forms/util/frm \
-    dbaccess/util/dba \
-    sfx2/util/sfx \
-    framework/util/fwk \
-    toolkit/util/tk \
-    unoxml/source/service/unoxml \
-    fileaccess/source/fileacc \
-    comphelper/util/comphelp \
-    i18npool/util/i18npool \
-	package/util/package2 \
-))
-
-$(eval $(call gb_RdbTarget_add_old_components,sw_filters_test,\
-    ucb1 \
-    ucpfile1 \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/RdbTarget_sw_swdoc_test.mk b/sw/RdbTarget_sw_swdoc_test.mk
deleted file mode 100644
index 34dbdc49bb7c..000000000000
--- a/sw/RdbTarget_sw_swdoc_test.mk
+++ /dev/null
@@ -1,47 +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
-#       Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 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,sw_swdoc_test))
-
-$(eval $(call gb_RdbTarget_add_components,sw_swdoc_test,\
-    sfx2/util/sfx \
-    framework/util/fwk \
-    unoxml/source/service/unoxml \
-    fileaccess/source/fileacc \
-    comphelper/util/comphelp \
-    i18npool/util/i18npool \
-))
-
-$(eval $(call gb_RdbTarget_add_old_components,sw_swdoc_test,\
-    ucb1 \
-    ucpfile1 \
-))
-
-# vim: set noet sw=4 ts=4: