diff options
| author | David Tardon <dtardon@redhat.com> | 2011-04-24 09:46:04 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-04-24 09:46:04 +0200 |
| commit | 7cfad1dad176cf78ec83c32c31e96a8126e8560f (patch) | |
| tree | 696ae5ee112fc5875d8bee37c227217abe1ee78d /lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk | |
| parent | Remove support for the obsolete BORLANDC compiler (diff) | |
| download | core-7cfad1dad176cf78ec83c32c31e96a8126e8560f.tar.gz core-7cfad1dad176cf78ec83c32c31e96a8126e8560f.zip | |
use the new UNO-related defs from CppunitTarget
Diffstat (limited to 'lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk')
| -rw-r--r-- | lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk index efb1e34bb573..595bc2e75e6f 100644 --- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk +++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk @@ -16,7 +16,9 @@ # Portions created by the Initial Developer are Copyright (C) 2010 the # Initial Developer. All Rights Reserved. # -# Major Contributor(s): Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com> +# Major Contributor(s): +# Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com> +# David Tardon, Red Hat Inc. <dtardon@redhat.com> # # For minor contributions see the git repository. # @@ -29,24 +31,12 @@ $(eval $(call gb_CppunitTest_CppunitTest,lotuswordpro_test_lotuswordpro)) -$(eval $(call gb_CppunitTest_uses_ure,lotuswordpro_test_lotuswordpro)) $(eval $(call gb_CppunitTest_add_package_headers,lotuswordpro_test_lotuswordpro,lotuswordpro_qa_cppunit)) $(eval $(call gb_CppunitTest_add_exception_objects,lotuswordpro_test_lotuswordpro, \ lotuswordpro/qa/cppunit/test_lotuswordpro \ )) -$(eval $(call gb_CppunitTest_set_args,lotuswordpro_test_lotuswordpro,\ - --headless \ - --invisible \ - "-env:UNO_TYPES=$(foreach binrdb,udkapi.rdb types.rdb,\ - file://$(if $(filter WNT,$(OS)),/)$(OUTDIR)/bin/$(binrdb))" \ - "-env:UNO_SERVICES=$(foreach rdb,$(OUTDIR)/xml/ure/services.rdb $(WORKDIR)/CustomTarget/lotuswordpro/qa/cppunit/services.rdb,\ - file://$(if $(filter WNT,$(OS)),/)$(rdb))" \ - $(foreach dir,URE_INTERNAL_LIB_DIR OOO_BASE_DIR BRAND_BASE_DIR, \ - -env:$(dir)=file://$(if $(filter WNT,$(OS)),/$(OUTDIR)/bin,$(OUTDIR)/lib)) \ -)) - $(eval $(call gb_CppunitTest_add_linked_libs,lotuswordpro_test_lotuswordpro, \ vcl \ comphelper \ @@ -62,6 +52,27 @@ $(eval $(call gb_CppunitTest_set_include,lotuswordpro_test_lotuswordpro,\ -I$(OUTDIR)/inc \ )) +$(eval $(call gb_CppunitTest_uses_ure,lotuswordpro_test_lotuswordpro)) + +$(eval $(call gb_CppunitTest_add_type_rdbs,lotuswordpro_test_lotuswordpro,\ + types \ +)) + +$(eval $(call gb_CppunitTest_add_service_rdbs,lotuswordpro_test_lotuswordpro,\ + lotuswordpro_test_lotuswordpro \ +)) + +$(eval $(call gb_CppunitTest_set_args,lotuswordpro_test_lotuswordpro,\ + --headless \ + --invisible \ +)) + +$(eval $(call gb_RdbTarget_RdbTarget,lotuswordpro_test_lotuswordpro)) + +$(eval $(call gb_RdbTarget_add_components,lotuswordpro_test_lotuswordpro,\ + lotuswordpro/util/lwpfilter,\ +)) + # we need to explicitly depend on library lwpft because it is not implied # by a link relation $(call gb_CppunitTest_get_target,lotuswordpro_test_lotuswordpro) : $(call gb_Library_get_target,lwpft) |