summaryrefslogtreecommitdiff
path: root/jfreereport/Package_jfreereport_libxml.mk
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2012-10-04 09:41:00 +0200
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-10-05 19:01:14 +0000
commit368e23a3908fcf87a1290ed21da4b57ccf8f3894 (patch)
treeadbc266c3521d5cca0be763a36b3cc9554ebd5b4 /jfreereport/Package_jfreereport_libxml.mk
parent3ec5db65a7b1dfde8246ed9855716916d6cc468e (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/Package_jfreereport_libxml.mk')
-rw-r--r--jfreereport/Package_jfreereport_libxml.mk19
1 files changed, 19 insertions, 0 deletions
diff --git a/jfreereport/Package_jfreereport_libxml.mk b/jfreereport/Package_jfreereport_libxml.mk
new file mode 100644
index 000000000000..6669f331a129
--- /dev/null
+++ b/jfreereport/Package_jfreereport_libxml.mk
@@ -0,0 +1,19 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_Package_Package,jfreereport_libxml,$(call gb_UnpackedTarball_get_dir,jfreereport_libxml)))
+
+$(eval $(call gb_Package_use_external_project,jfreereport_libxml,jfreereport_libxml))
+
+$(eval $(call gb_Package_add_file,jfreereport_libxml,bin/libxml-$(LIBXML_VERSION).jar,dist/libxml-$(LIBXML_VERSION).jar))
+
+# vim: set noet sw=4 ts=4: