[Libreoffice] gbuild question

[Matúš Kukan]

Hi Peter

On 25 September 2011 01:05, Peter Foley <pefoley2 at verizon.net> wrote:
> While working on converting xmerge to gbuild I found that the current
> gbuild Jar.mk doesn't support adding non java files to the jar.
> The xmerge jars need a component.xml file included in the jar.
> I tried to implement file adding but couldn't get it to work. Help with
> implementing this would be greatly appreciated.
> I've included my (non-working) attempt at implementing this and a
> usage example below.
>
Maybe you have already solved this but in case it could be helpful I'm
sending something that should more or less work.
See attached.

I think gd_Deliver is only for $(OUTDIR) so it can't be used in this case.
And maybe you want to use cp --foo, I'm not sure about proper parameters.

Main part:

+define gb_Jar_get_workdir
+$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,$(1)))
+endef
+
+define gb_Jar_add_file
+$(call gb_Jar_get_target,$(1)) : PACKAGEFILES += $(2)
+$(call gb_Jar_get_target,$(1)) : $(call gb_Jar_get_workdir,$(1))/$(2)
+$(call gb_Jar_get_workdir,$(1))/$(2) : $(3) $(call
gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,$(1)))
+       cp $(3) $$@
+
+endef

HTH,

Matus
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Jar.diff
Type: text/x-patch
Size: 1633 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20110929/6eda9f5c/attachment-0001.bin>