Skip to content

C
core
Kaydet (Commit) 88b5b368 authored tarafından David Tardon's avatar David Tardon
Dosyalara gözat
Seçenekler

gb_Jar_add_packagefile needs three args after all 

This partially reverts commit 713e536f .
üst e3f70a05
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
solenv/gbuild/Jar.mk
Dosyayı görüntüle @ 88b5b368
...@@ -127,11 +127,10 @@ endef ...@@ -127,11 +127,10 @@ endef
# PACKAGEFILES is the list of all root files to pack into the jar # PACKAGEFILES is the list of all root files to pack into the jar
define gb_Jar_add_packagefile define gb_Jar_add_packagefile
$(call gb_Jar_get_target,$(1)) : PACKAGEFILES += $(2) $(call gb_Jar_get_target,$(1)) : PACKAGEFILES += $(2)
$(call gb_Jar_get_target,$(1)) : $(call gb_Jar_get_workdir,$(1))/$(strip $(2))
endef $(call gb_Jar_get_workdir,$(1))/$(strip $(2)) : $(3) $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,$(1)))
mkdir -p $$(dir $$@)
define gb_Jar_add_packagefiles cp -rf $(3) $$@
$(foreach packagefile,$(2),$(call gb_Jar_add_packagefile,$(1),$(packagefile)))
endef endef
......
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