diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-05 22:57:22 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-06 12:41:36 +0200 |
| commit | 149cb468859e1f50e4a7ee1200f329791be97894 (patch) | |
| tree | 3c4904de271343fe16eaa2ab1a0a89d94545bf83 /solenv | |
| parent | 1a3ab52289338c4f07fc9fee3f9022be114d2553 (diff) | |
gbuild: add customtarget dependencies for java stuff
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Jar.mk | 12 | ||||
| -rw-r--r-- | solenv/gbuild/JavaClassSet.mk | 9 | ||||
| -rw-r--r-- | solenv/gbuild/JunitTest.mk | 15 |
3 files changed, 30 insertions, 6 deletions
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index d07467e2c698..9efc1e704e31 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -201,13 +201,23 @@ $(call gb_JavaClassSet_use_externals,$(call gb_Jar_get_classsetname,$(1)),$(2)) endef +define gb_Jar_add_customtarget_dependency +$(call gb_JavaClassSet_add_customtarget_dependency,$(call gb_Jar_get_classsetname,$(1)),$(2)) + +endef + +define gb_Jar_add_customtarget_dependencies +$(foreach customtarget,$(2),$(call gb_Jar_add_customtarget_dependency,$(1),$(customtarget))) + +endef + define gb_Jar_add_package_dependency $(call gb_JavaClassSet_add_package_dependency,$(call gb_Jar_get_classsetname,$(1)),$(2)) endef define gb_Jar_add_package_dependencies -$(call gb_JavaClassSet_add_package_dependencies,$(call gb_Jar_get_classsetname,$(1)),$(2)) +$(foreach package,$(2),$(call gb_Jar_add_package_dependency,$(1),$(package))) endef diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 8f48f5a6c8fc..df96284734ce 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -159,14 +159,15 @@ $(foreach external,$(2),$(call gb_JavaClassSet_use_external,$(1),$(external))) endef -define gb_JavaClassSet_add_package_dependency +define gb_JavaClassSet_add_customtarget_dependency $(call gb_JavaClassSet_get_preparation_target,$(1)) : \ - $(call gb_Package_get_target,$(2)) + $(call gb_CustomTarget_get_target,$(2)) endef -define gb_JavaClassSet_add_package_dependencies -$(foreach dependency,$(2),$(call gb_JavaClassSet_add_package_dependency,$(1),$(dependency))) +define gb_JavaClassSet_add_package_dependency +$(call gb_JavaClassSet_get_preparation_target,$(1)) : \ + $(call gb_Package_get_target,$(2)) endef diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 19b5e09c85ea..c861ea08b1ec 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -124,13 +124,23 @@ $(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(call endef +define gb_JunitTest_add_customtarget_dependency +$(call gb_JavaClassSet_add_customtarget_dependency,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) + +endef + +define gb_JunitTest_add_customtarget_dependencies +$(foreach dependency,$(2),$(call gb_JunitTest_add_customtarget_dependency,$(1),$(dependency))) + +endef + define gb_JunitTest_add_package_dependency $(call gb_JavaClassSet_add_package_dependency,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) endef define gb_JunitTest_add_package_dependencies -$(call gb_JavaClassSet_add_package_dependencies,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) +$(foreach dependency,$(2),$(call gb_JunitTest_add_package_dependency,$(1),$(dependency))) endef @@ -152,6 +162,9 @@ gb_JunitTest_add_sourcefile := gb_JunitTest_add_sourcefiles := gb_JunitTest_add_jar := gb_JunitTest_add_jars := +gb_JunitTest_add_jar_classset := +gb_JunitTest_add_customtarget_dependency := +gb_JunitTest_add_customtarget_dependencies := gb_JunitTest_add_package_dependency := gb_JunitTest_add_package_dependencies := |