diff options
| author | David Tardon <dtardon@redhat.com> | 2011-12-23 16:08:18 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-12-23 16:43:02 +0100 |
| commit | 7fe7126248ff043e2f9a36f07c544602f1d774af (patch) | |
| tree | 78d579dc425fbd8aaeb4ca2855433dab00ec930c | |
| parent | avoid copying hack (diff) | |
| download | core-7fe7126248ff043e2f9a36f07c544602f1d774af.tar.gz core-7fe7126248ff043e2f9a36f07c544602f1d774af.zip | |
allow use of generated files in gb_Jar
| -rw-r--r-- | solenv/gbuild/Jar.mk | 10 | ||||
| -rw-r--r-- | solenv/gbuild/JavaClassSet.mk | 15 |
2 files changed, 25 insertions, 0 deletions
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 295aa693e899..b5ba394ee7ac 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -140,6 +140,16 @@ $(foreach sourcefile,$(2),$(call gb_Jar_add_sourcefile,$(1),$(sourcefile))) endef +define gb_Jar_add_generated_sourcefile +$(call gb_JavaClassSet_add_generated_sourcefile,$(call gb_Jar_get_classsetname,$(1)),$(2)) + +endef + +define gb_Jar_add_generated_sourcefiles +$(foreach sourcefile,$(2),$(call gb_Jar_add_generated_sourcefile,$(1),$(sourcefile))) + +endef + define gb_JarTest_set_classpath $(call gb_JavaClassSet_set_classpath,$(call gb_Jar_get_classsetname,$(1)),$(2)) diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 61cb4e83bc31..6befda19aa2c 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -69,6 +69,10 @@ define gb_JavaClassSet__get_sourcefile $(SRCDIR)/$(1).java endef +define gb_JavaClassSet__get_generated_sourcefile +$(WORKDIR)/$(1).java +endef + define gb_JavaClassSet_add_sourcefile $(call gb_JavaClassSet_get_target,$(1)) : $(call gb_JavaClassSet__get_sourcefile,$(2)) @@ -79,6 +83,17 @@ $(foreach sourcefile,$(2),$(call gb_JavaClassSet_add_sourcefile,$(1),$(sourcefil endef +define gb_JavaClassSet_add_generated_sourcefile +$(call gb_JavaClassSet_get_target,$(1)) : $(call gb_JavaClassSet__get_generated_sourcefile,$(2)) +$(call gb_JavaClassSet__get_generated_sourcefile,$(2)) : $(gb_Helper_PHONY) + +endef + +define gb_JavaClassSet_add_generated_sourcefiles +$(foreach sourcefile,$(2),$(call gb_JavaClassSet_add_generated_sourcefile,$(1),$(sourcefile))) + +endef + define gb_JavaClassSet_set_classpath $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $(2) |