diff options
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/gbuild/CppunitTest.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/Jar.mk | 4 | ||||
-rw-r--r-- | solenv/gbuild/JunitTest.mk | 8 |
3 files changed, 9 insertions, 5 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 69eae9169040..15e525452150 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -378,7 +378,7 @@ 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))) \ + $(foreach jar,java_uno juh ridl 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) \ diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 151fb990a0a6..6f86b4a79a42 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -89,7 +89,7 @@ $(call gb_Jar_get_target,$(1)) : endef # resets scoped variables (see explanations where they are set) -# creates a class set and a dependency to it +# creates a class set and a dependency to it # registers target and clean target # adds jar files to DeliverLogTarget define gb_Jar_Jar @@ -250,7 +250,7 @@ define gb_Jar_use_external_project $(call gb_JavaClassSet_use_external_project,$(call gb_Jar_get_classsetname,$(1)),$(2)) endef -# possible directories for jar files containing UNO services +# possible directories for jar files containing UNO services gb_Jar_COMPONENTPREFIXES := \ OOO:vnd.sun.star.expand:\dLO_JAVA_DIR/ \ URE:vnd.sun.star.expand:\dURE_INTERNAL_JAVA_DIR/ \ diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 236516a72c6c..e5fab5eae68e 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -117,6 +117,12 @@ $(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(call endef +define gb_JunitTest_add_classpath +$(call gb_JavaClassSet_add_classpath,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) +$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(2) + +endef + define gb_JunitTest_use_system_jar $(call gb_JavaClassSet_use_system_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) @@ -155,10 +161,8 @@ endef define gb_JunitTest_use_unoapi_jars $(eval $(call gb_JunitTest_use_jars,$(1),\ OOoRunner \ - jurt \ ridl \ test \ - unoil \ )) endef |