368e23a390
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>
40 lines
1.2 KiB
Makefile
40 lines
1.2 KiB
Makefile
# -*- 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 RSCREVISION
|
|
include $(SOLARENV)/inc/minor.mk
|
|
# for VERSION
|
|
include $(SRCDIR)/jfreereport/version.mk
|
|
|
|
$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libloader))
|
|
|
|
$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libloader,jfreereport_libloader))
|
|
|
|
$(eval $(call gb_ExternalProject_register_targets,jfreereport_libloader,\
|
|
build \
|
|
))
|
|
|
|
$(call gb_ExternalProject_get_state_target,jfreereport_libloader,build) :
|
|
cd "$(call gb_UnpackedTarball_get_dir,jfreereport_libloader)" && \
|
|
"$(ANT)" \
|
|
-q \
|
|
-f build.xml \
|
|
-Dbuild.label="build-$(RSCREVISION)" \
|
|
$(if $(filter yes,$(JAVACISGCJ))\
|
|
,-Dbuild.compiler=gcj \
|
|
,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
|
|
-Dant.build.javac.target=$(JAVA_TARGET_VER) \
|
|
) \
|
|
-Dantcontrib.available="true" \
|
|
-Dbuild.id="10682" \
|
|
-Dproject.revision="$(LIBLOADER_VERSION)" \
|
|
$(if $(debug),-Dbuild.debug="on") jar && \
|
|
touch $@
|
|
|
|
# vim: set noet sw=4 ts=4:
|