summaryrefslogtreecommitdiffstats
path: root/starmath/CppunitTest_starmath_qa_cppunit.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 /starmath/CppunitTest_starmath_qa_cppunit.mk
parentForgot to move solenv/wntgcci/inc to solenv/inc/wntgcci (diff)
downloadcore-f66ac2934303e789014741547a06c98ab5433ca0.tar.gz
core-f66ac2934303e789014741547a06c98ab5433ca0.zip
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 'starmath/CppunitTest_starmath_qa_cppunit.mk')
-rw-r--r--starmath/CppunitTest_starmath_qa_cppunit.mk20
1 files changed, 18 insertions, 2 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 \
))