diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-02-17 11:07:29 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-02-17 11:14:30 +0100 |
| commit | 77d120691d0bf8636f86e34a8d4926c260d73f68 (patch) | |
| tree | 739e05dbba4b502c634781d921f176913cabd142 /solenv/gbuild | |
| parent | 98f60e460ea64f061ca6948691a29d4cf29eb0a4 (diff) | |
Pass JunitTest jar deps to underlying JavaClassSet
...and make underlying JavaClassSet implicitly depend on OOO_JUNI_JAR
...and remove unused gb_JunitTest_set_classpath
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/JunitTest.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 8d3656a28ea6..5cef3a43238e 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -74,6 +74,7 @@ $(call gb_JunitTest_get_target,$(1)) : CLASSES := $(call gb_JunitTest_JunitTest_platform,$(1)) $(call gb_JavaClassSet_JavaClassSet,$(call gb_JunitTest_get_classsetname,$(1))) +$(call gb_JavaClassSet_add_system_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(OOO_JUNIT_JAR)) $(call gb_JunitTest_get_target,$(1)) : $(call gb_JavaClassSet_get_target,$(call gb_JunitTest_get_classsetname,$(1))) $(eval $(call gb_Module_register_target,$(call gb_JunitTest_get_target,$(1)),$(call gb_JunitTest_get_clean_target,$(1)))) endef @@ -104,12 +105,8 @@ $(foreach sourcefile,$(2),$(call gb_JunitTest_add_sourcefile,$(1),$(sourcefile)) endef -define gb_JunitTest_set_classpath -$(call gb_JunitTest_get_target,$(1)) : T_CP := $(2) - -endef - define gb_JunitTest_add_jar +$(call gb_JavaClassSet_add_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) $(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(2) $(call gb_JunitTest_get_target,$(1)) : $(2) $(2) :| $(gb_Helper_PHONY) @@ -147,7 +144,6 @@ gb_JunitTest_add_classes := gb_JunitTest_add_class := gb_JunitTest_add_sourcefile := gb_JunitTest_add_sourcefiles := -gb_JunitTest_set_classpath := gb_JunitTest_add_jar := gb_JunitTest_add_jars := gb_JunitTest_add_package_dependency := |