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/prj | |
| 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/prj')
| -rw-r--r-- | jfreereport/prj/build.lst | 15 | ||||
| -rw-r--r-- | jfreereport/prj/dmake | 0 |
2 files changed, 2 insertions, 13 deletions
diff --git a/jfreereport/prj/build.lst b/jfreereport/prj/build.lst index 62cdd738c3b6..3c5fea8f80e4 100644 --- a/jfreereport/prj/build.lst +++ b/jfreereport/prj/build.lst @@ -1,13 +1,2 @@ -jf jfreereport : solenv APACHE_COMMONS:apache-commons NULL -jf jfreereport usr1 - all jf_mkout NULL -jf jfreereport\java\sac nmake - all jf_sac NULL -jf jfreereport\java\libbase nmake - all jf_libbase NULL -jf jfreereport\java\flute nmake - all jf_flute jf_sac NULL -jf jfreereport\java\libloader nmake - all jf_libloader jf_libbase NULL -jf jfreereport\java\libxml nmake - all jf_libxml jf_libbase jf_libloader NULL -jf jfreereport\java\libformula nmake - all jf_libformula jf_libbase NULL -jf jfreereport\java\libfonts nmake - all jf_libfonts jf_libbase jf_libloader NULL -jf jfreereport\java\librepository nmake - all jf_librepository jf_libbase NULL -jf jfreereport\java\libserializer nmake - all jf_libserializer jf_libbase NULL -jf jfreereport\java\jfreereport nmake - all jf_jfreereport jf_liblayout jf_libformula jf_libserializer NULL -jf jfreereport\java\liblayout nmake - all jf_liblayout jf_libbase jf_flute jf_libfonts jf_libloader jf_librepository jf_libxml jf_sac NULL +jf jfreereport : solenv APACHE_COMMONS:apache-commons NULL +jf jfreereport\prj nmake - all jf_sac NULL diff --git a/jfreereport/prj/dmake b/jfreereport/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/jfreereport/prj/dmake +++ /dev/null |