diff options
| author | David Tardon <dtardon@redhat.com> | 2011-04-24 09:35:45 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-04-24 09:35:45 +0200 |
| commit | 69f0b91202e546631ed27442f4eb8fc30126f361 (patch) | |
| tree | 20dc29855b486d805bbf9d160eea2d3a961710f3 /sc/CppunitTest_sc_ucalc.mk | |
| parent | ee0110327ab820f255eb486b1afa8381087dee2f (diff) | |
use the new UNO-related defs from CppunitTarget
Diffstat (limited to 'sc/CppunitTest_sc_ucalc.mk')
| -rw-r--r-- | sc/CppunitTest_sc_ucalc.mk | 42 |
1 files changed, 30 insertions, 12 deletions
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index ad929cde0878..dd2bd6496ee9 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -17,6 +17,7 @@ # Initial Developer. All Rights Reserved. # # Major Contributor(s): +# David Tardon, Red Hat Inc. <dtardon@redhat.com> # # For minor contributions see the git repository. # @@ -29,24 +30,12 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_ucalc)) -$(eval $(call gb_CppunitTest_uses_ure,sc_ucalc)) $(eval $(call gb_CppunitTest_add_package_headers,sc_ucalc,sc_qa_unit)) $(eval $(call gb_CppunitTest_add_exception_objects,sc_ucalc, \ sc/qa/unit/ucalc \ )) -$(eval $(call gb_CppunitTest_set_args,sc_ucalc,\ - --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/sc/qa/unit/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_library_objects,sc_ucalc,sc)) $(eval $(call gb_CppunitTest_add_linked_libs,sc_ucalc, \ @@ -88,4 +77,33 @@ $(eval $(call gb_CppunitTest_set_include,sc_ucalc,\ -I$(OUTDIR)/inc \ )) +$(eval $(call gb_CppunitTest_uses_ure,sc_ucalc)) + +$(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_set_args,sc_ucalc,\ + --headless \ + --invisible \ +)) + +$(eval $(call gb_RdbTarget_RdbTarget,sc_ucalc)) + +$(eval $(call gb_RdbTarget_add_components,sc_ucalc,\ + framework/util/fwk \ + sfx2/util/sfx \ + unoxml/source/service/unoxml \ +)) + +$(eval $(call gb_RdbTarget_add_old_components,sc_ucalc,\ + i18npool \ + ucb1 \ + ucpfile1 \ +)) + # vim: set noet sw=4: |