From 368e23a3908fcf87a1290ed21da4b57ccf8f3894 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Thu, 4 Oct 2012 09:41:00 +0200 Subject: gbuildification of jfreereport In dmake jfreereport build system an intermediate directory classes was used. All artefacts that created during build were copied there, including external apache-commons-logging.jar. Finally java system property was used -Dlib=classes. In gbuild we don't want to mess with copying artefacts around. The artefacts are packaging in $(OUTDIR)/bin and java system property points to -Dlib=$(OUTDIR)/bin. However the dependencies must be set inside jfreereport module, because of jar interdependency: liblayout depends on other jars and flow-engine depends on liblayout. This is achived with new function gb_ExternalProject_use_packages. Special treatment is necessary when system apache-commons library is used, in which case it is not reside in $(OUTDIR)/bin, but in /usr/share/java/commons-logging.jar or in custom location. For that purpose the both patches: flow-engine.patch and liblayout.patch were extended and new java system property was introduced -Dcommons-logging.jar and passed to the build.xml. A dependency from liblayout to apache-commons-logging is set. jfreereport was moved to tail_build module. Change-Id: I32e39bb5f4f825f182c3bd3cfc1a13ea1c38321e Reviewed-on: https://gerrit.libreoffice.org/761 Reviewed-by: Norbert Thiebaud Tested-by: Norbert Thiebaud --- Makefile.top | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.top') diff --git a/Makefile.top b/Makefile.top index bb632a241546..ccf658988dac 100644 --- a/Makefile.top +++ b/Makefile.top @@ -89,6 +89,7 @@ idl\ idlc\ io\ javaunohelper\ +jfreereport\ jurt\ jvmaccess\ jvmfwk\ @@ -219,7 +220,6 @@ hunspell\ hyphen\ icu\ instsetoo_native\ -jfreereport\ jpeg\ libcroco\ libexttextcat\ -- cgit