diff options
| author | David Tardon <dtardon@redhat.com> | 2014-08-02 15:12:15 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-08-02 19:16:37 +0200 |
| commit | 00daa1f560676ed15583f0a4353e7be18a917f91 (patch) | |
| tree | 970aaeb1f56011462685829d2ddaddd6762c9144 | |
| parent | gbuild: require java UNO runtime explicitly (diff) | |
| download | core-00daa1f560676ed15583f0a4353e7be18a917f91.tar.gz core-00daa1f560676ed15583f0a4353e7be18a917f91.zip | |
fix java deps for services test
Change-Id: Ifa7a67862fca71dfd96dc55eec9f065f303d88a9
| -rw-r--r-- | postprocess/CppunitTest_services.mk | 7 | ||||
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 11 |
2 files changed, 15 insertions, 3 deletions
diff --git a/postprocess/CppunitTest_services.mk b/postprocess/CppunitTest_services.mk index 08c860e16412..647d9eb3f877 100644 --- a/postprocess/CppunitTest_services.mk +++ b/postprocess/CppunitTest_services.mk @@ -38,9 +38,10 @@ endif $(eval $(call gb_CppunitTest_use_configuration,services)) ifeq ($(ENABLE_JAVA),TRUE) -$(call gb_CppunitTest_get_target,services): $(call gb_Jar_get_target,unoil) -$(eval $(call gb_CppunitTest_add_arguments,services, \ - -env:URE_MORE_JAVA_TYPES=$(call gb_Helper_make_url,$(call gb_Jar_get_target,unoil)) \ +$(eval $(call gb_CppunitTest_use_java_ure,services)) + +$(eval $(call gb_CppunitTest_use_jars,services,\ + smoketest \ )) endif diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 4f4993ff62ae..1ef9a6144628 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -52,6 +52,8 @@ $(if $(URE),\ "-env:UNO_TYPES=$(foreach item,$(UNO_TYPES),$(call gb_Helper_make_url,$(item)))") \ $(if $(strip $(UNO_SERVICES)),\ "-env:UNO_SERVICES=$(foreach item,$(UNO_SERVICES),$(call gb_Helper_make_url,$(item)))") \ + $(if $(strip $(JAVA_URE)),\ + -env:URE_MORE_JAVA_TYPES=$(call gb_Helper_make_url,$(call gb_Jar_get_target,unoil))) \ -env:URE_INTERNAL_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_URE_LIB_FOLDER)) \ -env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_LIB_FOLDER)) \ -env:LO_JAVA_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)) \ @@ -119,6 +121,7 @@ $(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_ta $(call gb_CppunitTest_CppunitTest_platform,$(1),$(2),$(gb_CppunitTest_DLLDIR)/$(call gb_CppunitTest_get_ilibfilename,$(1))) $(call gb_CppunitTest_get_target,$(1)) : ARGS := $(call gb_CppunitTest_get_target,$(1)) : CONFIGURATION_LAYERS := +$(call gb_CppunitTest_get_target,$(1)) : JAVA_URE := $(false) $(call gb_CppunitTest_get_target,$(1)) : URE := $(false) $(call gb_CppunitTest_get_target,$(1)) : VCL := $(false) $(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES := @@ -262,9 +265,17 @@ $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Executable_get_target,$(2)) endef define gb_CppunitTest_use_java_ure +$(call gb_CppunitTest_get_target,$(1)) : JAVA_URE := $(true) $(call gb_CppunitTest_get_target,$(1)) : \ $(foreach jar,java_uno juh jurt unoil unoloader,$(call gb_Jar_get_target,$(jar))) \ $(call gb_Library_get_target,affine_uno_uno) \ + $(call gb_Library_get_target,java_uno) \ + $(call gb_Library_get_target,jpipe) \ + $(call gb_Library_get_target,juhx) \ + $(call gb_Library_get_target,juhx) \ + $(call gb_Library_get_target,jvmaccess) \ + $(call gb_Library_get_target,jvmfwk) \ + $(call gb_Library_get_target,sunjavaplugin) \ $(call gb_Package_get_target,jvmfwk_javavendors) \ $(call gb_Package_get_target,jvmfwk_jreproperties) |