diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2012-10-04 09:41:00 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-10-05 19:01:14 +0000 |
| commit | 368e23a3908fcf87a1290ed21da4b57ccf8f3894 (patch) | |
| tree | adbc266c3521d5cca0be763a36b3cc9554ebd5b4 /config_host.mk.in | |
| parent | 3ec5db65a7b1dfde8246ed9855716916d6cc468e (diff) | |
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 <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 48710b16439a..b8988b14d85f 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -487,6 +487,17 @@ export RPM=@RPM@ export RTL_OS=@RTL_OS@ export RTL_ARCH=@RTL_ARCH@ export SAC_JAR=@SAC_JAR@ +export JFREEREPORT_SAC_TARBALL=@JFREEREPORT_SAC_TARBALL@ +export JFREEREPORT_LIBBASE_TARBALL=@JFREEREPORT_LIBBASE_TARBALL@ +export JFREEREPORT_FLUTE_TARBALL=@JFREEREPORT_FLUTE_TARBALL@ +export JFREEREPORT_LIBLOADER_TARBALL=@JFREEREPORT_LIBLOADER_TARBALL@ +export JFREEREPORT_LIBXML_TARBALL=@JFREEREPORT_LIBXML_TARBALL@ +export JFREEREPORT_LIBFORMULA_TARBALL=@JFREEREPORT_LIBFORMULA_TARBALL@ +export JFREEREPORT_LIBFONTS_TARBALL=@JFREEREPORT_LIBFONTS_TARBALL@ +export JFREEREPORT_LIBREPOSITORY_TARBALL=@JFREEREPORT_LIBREPOSITORY_TARBALL@ +export JFREEREPORT_LIBSERIALIZER_TARBALL=@JFREEREPORT_LIBSERIALIZER_TARBALL@ +export JFREEREPORT_FLOW_ENGINE_TARBALL=@JFREEREPORT_FLOW_ENGINE_TARBALL@ +export JFREEREPORT_LIBLAYOUT_TARBALL=@JFREEREPORT_LIBLAYOUT_TARBALL@ export SAL_ENABLE_FILE_LOCKING=1 export SAXON_JAR=@SAXON_JAR@ export SAXON_TARBALL=@SAXON_TARBALL@ |