Kaydet (Commit) 7fe71262 authored tarafından David Tardon's avatar David Tardon

allow use of generated files in gb_Jar

üst f75d68b3
...@@ -140,6 +140,16 @@ $(foreach sourcefile,$(2),$(call gb_Jar_add_sourcefile,$(1),$(sourcefile))) ...@@ -140,6 +140,16 @@ $(foreach sourcefile,$(2),$(call gb_Jar_add_sourcefile,$(1),$(sourcefile)))
endef 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 define gb_JarTest_set_classpath
$(call gb_JavaClassSet_set_classpath,$(call gb_Jar_get_classsetname,$(1)),$(2)) $(call gb_JavaClassSet_set_classpath,$(call gb_Jar_get_classsetname,$(1)),$(2))
......
...@@ -69,6 +69,10 @@ define gb_JavaClassSet__get_sourcefile ...@@ -69,6 +69,10 @@ define gb_JavaClassSet__get_sourcefile
$(SRCDIR)/$(1).java $(SRCDIR)/$(1).java
endef endef
define gb_JavaClassSet__get_generated_sourcefile
$(WORKDIR)/$(1).java
endef
define gb_JavaClassSet_add_sourcefile define gb_JavaClassSet_add_sourcefile
$(call gb_JavaClassSet_get_target,$(1)) : $(call gb_JavaClassSet__get_sourcefile,$(2)) $(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 ...@@ -79,6 +83,17 @@ $(foreach sourcefile,$(2),$(call gb_JavaClassSet_add_sourcefile,$(1),$(sourcefil
endef 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 define gb_JavaClassSet_set_classpath
$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $(2) $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $(2)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment