summaryrefslogtreecommitdiff
path: root/writerfilter/CppunitTest_writerfilter_rtftok.mk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-11-11 10:01:19 +0100
committerStephan Bergmann <sbergman@redhat.com>2011-11-11 10:53:23 +0100
commitf66ac2934303e789014741547a06c98ab5433ca0 (patch)
treeaf6c01272d7068cb3199b640bcfe2bbfab5e2822 /writerfilter/CppunitTest_writerfilter_rtftok.mk
parent9cf9fb0b78f6006285ba14750566eb41b317a3fd (diff)
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.
Diffstat (limited to 'writerfilter/CppunitTest_writerfilter_rtftok.mk')
-rw-r--r--writerfilter/CppunitTest_writerfilter_rtftok.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk
index a104cfe756ff..dbb5582d1cf0 100644
--- a/writerfilter/CppunitTest_writerfilter_rtftok.mk
+++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk
@@ -58,8 +58,13 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,writerfilter_rtftok,\
types \
))
-$(eval $(call gb_CppunitTest_add_service_rdbs,writerfilter_rtftok,\
- writerfilter_rtftok \
+$(eval $(call gb_CppunitTest_add_components,writerfilter_rtftok,\
+ writerfilter/util/writerfilter \
+))
+
+$(eval $(call gb_CppunitTest_add_old_components,writerfilter_rtftok,\
+ ucb1 \
+ ucpfile1 \
))
$(eval $(call gb_CppunitTest_set_args,writerfilter_rtftok,\