diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-11 10:01:19 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-11 10:53:23 +0100 |
commit | f66ac2934303e789014741547a06c98ab5433ca0 (patch) | |
tree | af6c01272d7068cb3199b640bcfe2bbfab5e2822 /sw/CppunitTest_sw_filters_test.mk | |
parent | 9cf9fb0b78f6006285ba14750566eb41b317a3fd (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 'sw/CppunitTest_sw_filters_test.mk')
-rw-r--r-- | sw/CppunitTest_sw_filters_test.mk | 20 |
1 files changed, 18 insertions, 2 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,\ |