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 /jfreereport/patches | |
| 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 'jfreereport/patches')
| -rw-r--r-- | jfreereport/patches/flow-engine.patch | 3 | ||||
| -rw-r--r-- | jfreereport/patches/liblayout.patch | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/jfreereport/patches/flow-engine.patch b/jfreereport/patches/flow-engine.patch index aef70cb7fef6..ae6864412879 100644 --- a/jfreereport/patches/flow-engine.patch +++ b/jfreereport/patches/flow-engine.patch @@ -1,9 +1,10 @@ --- misc/flow-engine-0.9.4/build.xml (Revision 6728) +++ misc/build/flow-engine-0.9.4/build.xml (Arbeitskopie) -@@ -24,6 +24,6 @@ +@@ -24,6 +24,7 @@ <!-- Setup the compile classpath --> <path id="classpath"> - <fileset dir="lib"> ++ <pathelement path="${commons-logging.jar}"/> + <fileset dir="${lib}"> <include name="*.jar" /> </fileset> diff --git a/jfreereport/patches/liblayout.patch b/jfreereport/patches/liblayout.patch index 4b1c23100987..6da279361f07 100644 --- a/jfreereport/patches/liblayout.patch +++ b/jfreereport/patches/liblayout.patch @@ -1,9 +1,10 @@ --- misc/liblayout-0.2.10/build.xml (Revision 6728) +++ misc/build/liblayout-0.2.10/build.xml (Arbeitskopie) -@@ -24,6 +24,6 @@ +@@ -24,6 +24,7 @@ <!-- Setup the compile classpath --> <path id="classpath"> - <fileset dir="lib"> ++ <pathelement path="${commons-logging.jar}"/> + <fileset dir="${lib}"> <include name="*.jar" /> </fileset> |