qadevOOo/Jar_OOoRunner.mk | 4 +--- solenv/gbuild/Jar.mk | 9 ++++----- 2 files changed, 5 insertions(+), 8 deletions(-)
New commits: commit 88b5b3688e516666fa693353a542b6c8302e6a45 Author: David Tardon <dtar...@redhat.com> Date: Fri Dec 23 17:41:59 2011 +0100 gb_Jar_add_packagefile needs three args after all This partially reverts commit 713e536fe987f4dbd901656fda19ec4908a0a2f1 . diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index b5ba394..f1fe144 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 commit e3f70a05b3e590fcb2e75cd4e380e2f3a0530c18 Author: David Tardon <dtar...@redhat.com> Date: Fri Dec 23 17:39:52 2011 +0100 Revert "gb_Jar_add_packagefiles only takes 2 args" This reverts commit f3f77fd5cdd0a04115af255430a97e6dec24d85f. diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index c005489..8268975 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)) _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits