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 /sc/CppunitTest_sc_filters_test.mk | |
parent | Forgot to move solenv/wntgcci/inc to solenv/inc/wntgcci (diff) | |
download | core-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 'sc/CppunitTest_sc_filters_test.mk')
-rw-r--r-- | sc/CppunitTest_sc_filters_test.mk | 45 |
1 files changed, 43 insertions, 2 deletions
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index a8aed8185939..47fb2c5f1cac 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -88,8 +88,49 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_filters_test,\ types \ )) -$(eval $(call gb_CppunitTest_add_service_rdbs,sc_filters_test,\ - sc_filters_test \ +$(eval $(call gb_CppunitTest_add_components,sc_filters_test,\ + basic/util/sb \ + comphelper/util/comphelp \ + dbaccess/util/dba \ + fileaccess/source/fileacc \ + filter/source/config/cache/filterconfig1 \ + forms/util/frm \ + framework/util/fwk \ + i18npool/util/i18npool \ + oox/util/oox \ + package/source/xstor/xstor \ + package/util/package2 \ + sax/source/expatwrap/expwrap \ + sax/source/fastparser/fastsax \ + sc/util/sc \ + sc/util/scfilt \ + sfx2/util/sfx \ + sot/util/sot \ + toolkit/util/tk \ + unotools/util/utl \ + unoxml/source/rdf/unordf \ + unoxml/source/service/unoxml \ + xmlsecurity/util/xsec_fw \ + xmlsecurity/util/xmlsecurity \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_CppunitTest_add_components,sc_filters_test,\ + xmlsecurity/util/xsec_xmlsec.windows \ +)) + +else +$(eval $(call gb_CppunitTest_add_components,sc_filters_test,\ + xmlsecurity/util/xsec_xmlsec \ +)) + +endif + +$(eval $(call gb_CppunitTest_add_old_components,sc_filters_test,\ + configmgr \ + ucb1 \ + ucpfile1 \ + ucptdoc1 \ )) $(eval $(call gb_CppunitTest_set_args,sc_filters_test,\ |