[Libreoffice-commits] .: reportbuilder/util

[Stephan Bergmann]

 reportbuilder/util/makefile.mk |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit b67ae8dd02a1b9aeb35ef123017d8c02d1d8aaf5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Oct 31 12:39:38 2011 +0100

    Make sure COMPONENT_EXTJARFILES are included in report-builder.oxt.

diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
index 8e838e7..c099efb 100644
--- a/reportbuilder/util/makefile.mk
+++ b/reportbuilder/util/makefile.mk
@@ -86,12 +86,13 @@ COMPONENT_HELP= \
 
 # .jar files from solver
 COMPONENT_EXTJARFILES = \
-    $(EXTENSIONDIR)$/sun-report-builder.jar 					\
+    $(EXTENSIONDIR)$/sun-report-builder.jar
+COMPONENT_EXTJARFILES_COPY = \
     $(OUTDIR)$/bin$/reportbuilderwizard.jar
 
 .IF "$(SYSTEM_JFREEREPORT)" != "YES"
 .INCLUDE :  $(OUTDIR)/bin/jfreereport_version.mk
-COMPONENT_EXTJARFILES += \
+COMPONENT_EXTJARFILES_COPY += \
     $(OUTDIR)$/bin$/flute-$(FLUTE_VERSION).jar				            \
     $(OUTDIR)$/bin$/libserializer-$(LIBSERIALIZER_VERSION).jar			\
     $(OUTDIR)$/bin$/libbase-$(LIBBASE_VERSION).jar                     \
@@ -105,7 +106,7 @@ COMPONENT_EXTJARFILES += \
     $(OUTDIR)$/bin$/sac.jar
 .ENDIF
 .IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
-COMPONENT_EXTJARFILES += \
+COMPONENT_EXTJARFILES_COPY += \
     $(OUTDIR)$/bin$/commons-logging-1.1.1.jar
 .ENDIF
 
@@ -113,7 +114,7 @@ COMPONENT_MANIFEST_GENERIC:=TRUE
 COMPONENT_MANIFEST_SEARCHDIR:=registry
 
 # make sure to add your custom files here
-EXTENSION_PACKDEPS=$(COMPONENT_EXTJARFILES) $(COMPONENT_HTMLFILES) $(COMPONENT_OTR_FILES) $(COMPONENT_HELP) $(COMPONENT_IMAGES)
+EXTENSION_PACKDEPS=$(COMPONENT_EXTJARFILES) $(MISC)/$(TARGET).copied $(COMPONENT_HTMLFILES) $(COMPONENT_OTR_FILES) $(COMPONENT_HELP) $(COMPONENT_IMAGES)
 .ENDIF
 # --- Targets ----------------------------------
 
@@ -144,6 +145,11 @@ $(COMPONENT_HELP) : $$(@:f)
 $(DESCRIPTION_SRC): description.xml
     +-$(RM) $@
     $(TYPE) description.xml | $(SED) "s/#VERSION#/$(EXTENSION_VERSION)/" > $@
+
+$(MISC)/$(TARGET).copied: $(COMPONENT_EXTJARFILES_COPY)
+    @@-$(MKDIRHIER) $(EXTENSIONDIR)
+    : $(foreach,i,$(COMPONENT_EXTJARFILES_COPY) && $(COPY) $i $(EXTENSIONDIR)/)
+    $(TOUCH) $@
 .ENDIF
 .ELSE			# "$(SOLAR_JAVA)"!=""
 .INCLUDE : target.mk