diff options
| author | David Tardon <dtardon@redhat.com> | 2011-04-23 18:04:39 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-04-23 21:07:58 +0200 |
| commit | 54ebdf3c216af257dcd29fdc2112ce1001bd9033 (patch) | |
| tree | a3ed9ca6fb381da5c2665ca9d2f2fad2650bbe46 | |
| parent | fac629fbdd7279a6beb272907dedd9f1cdfd195e (diff) | |
move common UNO stuff to CppunitTest
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 43 |
1 files changed, 42 insertions, 1 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 22b4dc288ee2..0d3cc7f4187d 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -43,6 +43,24 @@ gb_CppunitTest_CPPTESTTARGET := $(call gb_Executable_get_target,cppunit/cppunitt gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) $(gb_CppunitTest_GDBTRACE) STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) $(gb_CppunitTest_CPPTESTTARGET) gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1)) +# TODO: move this to platform under suitable name +gb_CppunitTarget__make_url = file://$(if $(filter WNT,$(OS)),/)$(1) + +gb_CppunitTest__get_uno_type_target = $(OUTDIR)/bin/$(1).rdb +define gb_CppunitTest__make_args +$(ARGS) \ +$(if $(strip $(UNO_TYPES)),\ + "-env:UNO_TYPES=$(foreach rdb,udkapi $(UNO_TYPES),\ + $(call gb_CppunitTarget__make_url,$(call gb_CppunitTest__get_uno_type_target,$(rdb))))") \ +$(if $(strip $(UNO_SERVICES)),\ + "-env:UNO_SERVICES=$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/ure/services.rdb) \ + $(foreach rdb,$(UNO_SERVICES),\ + $(call gb_CppunitTarget__make_url,$(call gb_RdbTarget_get_target,$(rdb))))") \ +$(if $(URE),\ + $(foreach dir,URE_INTERNAL_LIB_DIR OOO_BASE_DIR BRAND_BASE_DIR,\ + -env:$(dir)=file://$(if $(filter WNT,$(OS)),/$(OUTDIR)/bin,$(OUTDIR)/lib))) +endef + .PHONY : $(call gb_CppunitTest_get_clean_target,%) $(call gb_CppunitTest_get_clean_target,%) : $(call gb_Helper_abbreviate_dirs,\ @@ -53,7 +71,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTTARGET) $(call gb_Output_announce,$*,$(true),CUT,2) $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $@) && \ - $(gb_CppunitTest_CPPTESTCOMMAND) $(call gb_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) $(ARGS) > $@.log 2>&1 || (cat $@.log && false)) + $(gb_CppunitTest_CPPTESTCOMMAND) $(call gb_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) $(call gb_CppunitTest__make_args,$(ARGS),$(UNO_SERVICES),$(UNO_TYPES)) > $@.log 2>&1 || (cat $@.log && false)) define gb_CppunitTest_CppunitTest $(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest__get_linktargetname,$(1))) @@ -73,6 +91,9 @@ $(call gb_CppunitTest_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) $(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2)) $(call gb_CppunitTest_CppunitTest_platform,$(1),$(2),$(gb_CppunitTest_DLLDIR)/$(call gb_CppunitTest_get_libfilename,$(1))) $(call gb_CppunitTest_get_target,$(1)) : ARGS := +$(call gb_CppunitTest_get_target,$(1)) : URE := $(false) +$(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES := +$(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES := $$(eval $$(call gb_Module_register_target,$(call gb_CppunitTest_get_target,$(1)),$(call gb_CppunitTest_get_clean_target,$(1)))) endef @@ -85,7 +106,27 @@ endef # Once we build the services.rdb with gbuild we should use its *_get_target method define gb_CppunitTest_uses_ure $(call gb_CppunitTest_get_target,$(1)) : $(OUTDIR)/xml/ure/services.rdb +$(call gb_CppunitTest_get_target,$(1)) : URE := $(true) + +endef + +define gb_CppunitTest_add_type_rdb +$(call gb_CppunitTest_get_target,$(1)) : $(call gb_CppunitTest__get_uno_type_target,$(2)) +$(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES += $(2) +endef + +define gb_CppunitTest_add_type_rdbs +$(foreach rdb,$(2),$(eval $(call gb_CppunitTest_add_type_rdb,$(1),$(rdb)))) +endef + +define gb_CppunitTest_add_service_rdb +$(call gb_CppunitTest_get_target,$(1)) : $(call gb_RdbTarget_get_target,$(2)) +$(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_RdbTarget_get_clean_target,$(2)) +$(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES += $(2) +endef +define gb_CppunitTest_add_service_rdbs +$(foreach rdb,$(2),$(eval $(call gb_CppunitTest_add_service_rdb,$(1),$(rdb)))) endef define gb_CppunitTest__forward_to_Linktarget |