diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-24 21:58:25 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-25 11:42:40 +0200 |
| commit | 30fc3d6cff15ceabea6e1f9c4683cd383c322d72 (patch) | |
| tree | 69f026eb0cfd6c07e22c0862db468dd08be9af7d /solenv/gbuild/JunitTest.mk | |
| parent | gbuild: add gb_ExternalProject_use_jars (diff) | |
| download | core-30fc3d6cff15ceabea6e1f9c4683cd383c322d72.tar.gz core-30fc3d6cff15ceabea6e1f9c4683cd383c322d72.zip | |
gbuild: refactor Jar target to stop using OUTDIR
- gb_Jar_get_target points to layer-specific location
- remove gb_Jar_get_outdir_target
- add OXT and NONE layers
- add a rule for every installed Jar to avoid problems with conflicting
pattern rules in instdir
Change-Id: Icf11869a454a7a52791c5ae257fc5da87aa46dc2
Diffstat (limited to 'solenv/gbuild/JunitTest.mk')
| -rw-r--r-- | solenv/gbuild/JunitTest.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 3d01c5c5e361..5e6e695ff2d7 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -102,8 +102,8 @@ endef define gb_JunitTest_use_jar $(call gb_JavaClassSet_use_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) -$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(call gb_Jar_get_outdir_target,$(2)) -$(call gb_JunitTest_get_target,$(1)) : $(call gb_Jar_get_outdir_target,$(2)) +$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(call gb_Jar_get_target,$(2)) +$(call gb_JunitTest_get_target,$(1)) : $(call gb_Jar_get_target,$(2)) endef |