[Libreoffice-commits] core.git: testtools/CustomTarget_uno_test.mk

[David Tardon]

Hi,

On Fri, Apr 05, 2013 at 03:17:45AM -0700, Stephan Bergmann wrote:
>  testtools/CustomTarget_uno_test.mk |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> New commits:
> commit ff8a2a5ef08623fdf534f805dfeedd673f64974e
> Author: Stephan Bergmann <sbergman at redhat.com>
> Date:   Fri Apr 5 12:15:30 2013 +0200
> 
>     Missing dependencies on UNO_SERVICES/TYPES references in solver uno ini-file
>     
>     ...resolved at runtime by cppuhelper library on which uno executable depends.
>     
>     Change-Id: Id654e240fe88268de3ae690b1746591a71ba5a1a
> 
> diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk
> index 7162611..205aea1 100644
> --- a/testtools/CustomTarget_uno_test.mk
> +++ b/testtools/CustomTarget_uno_test.mk
> @@ -32,7 +32,9 @@ $(eval $(call gb_CustomTarget_CustomTarget,testtools/uno_test))
>  $(call gb_CustomTarget_get_target,testtools/uno_test) : \
>  		$(call gb_Executable_get_runtime_dependencies,uno) \
>  		$(call gb_InternalUnoApi_get_target,bridgetest) \
> -		$(call gb_Rdb_get_outdir_target,uno_services)
> +		$(call gb_Rdb_get_outdir_target,uno_services) \
> +		$(call gb_Rdb_get_outdir_target,ure/services) \
> +		$(call gb_UnoApi_get_target,ure/types)

There is something fishy going on here. These added dependencies should
be already covered by $(call gb_Executable_get_runtime_dependencies,uno) .
These are defined as

define gb_Executable__register_uno
$(call gb_Executable_add_runtime_dependencies,uno,\
	$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
	$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
	$(call gb_Rdb_get_outdir_target_for_build,ure/services) \
	$(call gb_UnoApiMerge_get_target_for_build,ure/types) \
)
endef

(RepositoryExternal.mk:2742). I just checked that the dependencies are
expanded correctly, so I have no idea what went wrong.

D.