diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-10-21 14:15:48 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-10-21 14:40:06 +0100 |
| commit | 71f4a57b2af6c61533176100e39ce8b4276e807b (patch) | |
| tree | 53435be33370afe210f1b5735e258775e587ddfc /solenv | |
| parent | 160da638dc33a170d071bc80beec57c527756d1d (diff) | |
Warn if we're missing a RdbTarget from the check_targets
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/RdbTarget.mk | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 9908b906dbcd..3e0af86e11d5 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -33,7 +33,7 @@ DBGSV_ERROR_OUT := shell export DBGSV_ERROR_OUT -UNIT_FAILED_MSG := echo; echo "Error: a unit test failed, please do one of:"; echo; echo "export DEBUGCPPUNIT=TRUE \# for exception catching"; echo "export GDBCPPUNITTRACE=gdb \# for interactive debugging"; echo "export VALGRIND=memcheck \# for memory checking" ; echo "and retry." +UNIT_FAILED_MSG := echo; echo "Error: a unit test failed, please do one of:"; echo; echo "export DEBUGCPPUNIT=TRUE \# for exception catching"; echo "export GDBCPPUNITTRACE=gdb --args \# for interactive debugging"; echo "export VALGRIND=memcheck \# for memory checking" ; echo "and retry." ifeq ($(strip $(DEBUGCPPUNIT)),TRUE) gb_CppunitTest_GDBTRACE := gdb -nx --command=$(SOLARENV)/bin/gdbtrycatchtrace-stdout -return-child-result --args diff --git a/solenv/gbuild/RdbTarget.mk b/solenv/gbuild/RdbTarget.mk index fa9ab78941e3..4ce33a1d0f3b 100644 --- a/solenv/gbuild/RdbTarget.mk +++ b/solenv/gbuild/RdbTarget.mk @@ -27,11 +27,16 @@ # instead of those above. gb_RdbTarget__get_old_component_target = $(OUTDIR)/xml/$(1).component +gb_RdbTarget__get_rdbs = \ + $(foreach component,$(1),$(call gb_ComponentTarget_get_target,$(component))) \ + $(foreach component,$(2),$(call gb_RdbTarget__get_old_component_target,$(component))) $(call gb_RdbTarget_get_target,%) : $(call gb_Output_announce,$*,$(true),RDB,1) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ + $(if $(strip $(call gb_RdbTarget__get_rdbs,$(COMPONENTS),$(OLD_COMPONENTS))),, \ + $(error no components to register, check RdbTarget is included in gb_Module_add_check_targets - no rdb files)) \ echo '<?xml version="1.0"?><components xmlns="http://openoffice.org/2010/uno-components">' > $@ && \ $(gb_AWK) -- \ ' BEGIN { RS=">"; } \ @@ -40,9 +45,7 @@ $(call gb_RdbTarget_get_target,%) : gsub(/vnd.sun.star.expand:\$$OOO_BASE_DIR\/program/, "vnd.sun.star.expand:$$OOO_BASE_DIR",$$0); \ gsub(/vnd.sun.star.expand:\$$BRAND_BASE_DIR\/program/, "vnd.sun.star.expand:$$BRAND_BASE_DIR",$$0); \ print $$0 ">"; \ - }' \ - $(foreach component,$(COMPONENTS),$(call gb_ComponentTarget_get_target,$(component))) \ - $(foreach component,$(OLD_COMPONENTS),$(call gb_RdbTarget__get_old_component_target,$(component))) \ + }' $(call gb_RdbTarget__get_rdbs,$(COMPONENTS),$(OLD_COMPONENTS)) \ >> $@ && \ echo '</components>' >> $@) |