From f3f77fd5cdd0a04115af255430a97e6dec24d85f Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 23 Dec 2011 17:14:09 +0100 Subject: gb_Jar_add_packagefiles only takes 2 args --- qadevOOo/Jar_OOoRunner.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 826897560185..c0054892c040 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -71,4 +71,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/*/*/*/* \ )) -$(eval $(call gb_Jar_add_packagefile,OOoRunner,objdsc,$(SRCDIR)/qadevOOo/objdsc)) +$(eval $(call gb_Jar_add_packagefiles,OOoRunner,\ + $(SRCDIR)/qadevOOo/objdsc \ +)) -- cgit From e3f70a05b3e590fcb2e75cd4e380e2f3a0530c18 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 23 Dec 2011 17:39:52 +0100 Subject: Revert "gb_Jar_add_packagefiles only takes 2 args" This reverts commit f3f77fd5cdd0a04115af255430a97e6dec24d85f. --- qadevOOo/Jar_OOoRunner.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index c0054892c040..826897560185 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -71,6 +71,4 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/*/*/*/* \ )) -$(eval $(call gb_Jar_add_packagefiles,OOoRunner,\ - $(SRCDIR)/qadevOOo/objdsc \ -)) +$(eval $(call gb_Jar_add_packagefile,OOoRunner,objdsc,$(SRCDIR)/qadevOOo/objdsc)) -- cgit From 88b5b3688e516666fa693353a542b6c8302e6a45 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 23 Dec 2011 17:41:59 +0100 Subject: gb_Jar_add_packagefile needs three args after all This partially reverts commit 713e536fe987f4dbd901656fda19ec4908a0a2f1 . --- solenv/gbuild/Jar.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index b5ba394ee7ac..f1fe1444c8f4 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -127,11 +127,10 @@ endef # PACKAGEFILES is the list of all root files to pack into the jar define gb_Jar_add_packagefile $(call gb_Jar_get_target,$(1)) : PACKAGEFILES += $(2) - -endef - -define gb_Jar_add_packagefiles -$(foreach packagefile,$(2),$(call gb_Jar_add_packagefile,$(1),$(packagefile))) +$(call gb_Jar_get_target,$(1)) : $(call gb_Jar_get_workdir,$(1))/$(strip $(2)) +$(call gb_Jar_get_workdir,$(1))/$(strip $(2)) : $(3) $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,$(1))) + mkdir -p $$(dir $$@) + cp -rf $(3) $$@ endef -- cgit