summaryrefslogtreecommitdiff
path: root/sc/CppunitTest_sc_ucalc.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 /sc/CppunitTest_sc_ucalc.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 'sc/CppunitTest_sc_ucalc.mk')
-rw-r--r--sc/CppunitTest_sc_ucalc.mk12
1 files changed, 10 insertions, 2 deletions
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index fe853cc5fb68..6f0f5837a4dc 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -94,8 +94,16 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_ucalc,\
types \
))
-$(eval $(call gb_CppunitTest_add_service_rdbs,sc_ucalc,\
- sc_ucalc \
+$(eval $(call gb_CppunitTest_add_components,sc_ucalc,\
+ framework/util/fwk \
+ i18npool/util/i18npool \
+ sfx2/util/sfx \
+ unoxml/source/service/unoxml \
+))
+
+$(eval $(call gb_CppunitTest_add_old_components,sc_ucalc,\
+ ucb1 \
+ ucpfile1 \
))
$(eval $(call gb_CppunitTest_set_args,sc_ucalc,\