registry/source/regimpl.cxx | 6 +++--- solenv/gbuild/UnoApiTarget.mk | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-)
New commits: commit f25ef2b904652ab3162c61864eeb5a2381bb796f Author: Michael Stahl <mst...@redhat.com> Date: Tue Jan 17 15:43:11 2012 +0100 gbuild: UnoApiTarget: initialize target local vars Fixes the problem in offapi, where a rebuild after changing an IDL file would produce an offapi.rdb that contained the stale content of the old version of the IDL file. This was because in offapi 2 rdb files are built, offapi.rdb and types.rdb, and types.rdb is a merge of udkapi.rdb and offapi.rdb, hence it depends on offapi.rdb. Unfortunately this means that the UNOAPI_MERGE variable for types.rdb is inherited to offapi.rdb, with the result that after the workdir offapi.rdb is built from .urd files, it is overwritten by a merge of udkapi.rdb and a stale offapi.rdb from the solver. diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 704659b..4614fc6 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -57,6 +57,10 @@ define gb_UnoApiTarget_UnoApiTarget $$(eval $$(call gb_Module_register_target,$(call gb_UnoApiOutTarget_get_target,$(1)),$(call gb_UnoApiOutTarget_get_clean_target,$(1)))) $(call gb_UnoApiOutTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) $(call gb_UnoApiOutTarget_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)) +$(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE := +$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_DEPS := +$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE := +$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := gb_UnoApiTarget_HPPFILES_$(1) := gb_UnoApiTarget_IDLFILES_$(1) := ifeq ($(gb_FULLDEPS),$(true)) commit aeb56b2ba1eefe08be4a7f20dc36d4a6200aa949 Author: Michael Stahl <mst...@redhat.com> Date: Tue Jan 17 15:37:44 2012 +0100 registry: print error messages on stderr diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index 5eb88c7..e82789b 100644 --- a/registry/source/regimpl.cxx +++ b/registry/source/regimpl.cxx @@ -1215,7 +1215,7 @@ RegError ORegistry::checkBlop(OStoreStream& rValue, if (bReport) { - fprintf(stdout, "WARNING: value of key \"%s\" already exists.\n", + fprintf(stderr, "WARNING: value of key \"%s\" already exists.\n", targetPath.getStr()); } return REG_MERGE_CONFLICT; @@ -1225,7 +1225,7 @@ RegError ORegistry::checkBlop(OStoreStream& rValue, rtl_freeMemory(pBuffer); if (bReport) { - fprintf(stdout, "ERROR: values of key \"%s\" contains bad data.\n", + fprintf(stderr, "ERROR: values of key \"%s\" contains bad data.\n", targetPath.getStr()); } return REG_MERGE_ERROR; @@ -1235,7 +1235,7 @@ RegError ORegistry::checkBlop(OStoreStream& rValue, rtl_freeMemory(pBuffer); if (bReport) { - fprintf(stdout, "ERROR: values of key \"%s\" has different types.\n", + fprintf(stderr, "ERROR: values of key \"%s\" has different types.\n", targetPath.getStr()); } return REG_MERGE_ERROR; _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits