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/java/flute | |
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/java/flute')
-rw-r--r-- | jfreereport/java/flute/makefile.mk | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/jfreereport/java/flute/makefile.mk b/jfreereport/java/flute/makefile.mk deleted file mode 100644 index 63731fda8997..000000000000 --- a/jfreereport/java/flute/makefile.mk +++ /dev/null @@ -1,79 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=jfreereport -TARGET=flute - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : antsettings.mk -.INCLUDE : $(PRJ)$/version.mk - -.IF "$(SOLAR_JAVA)" != "" -# --- Files -------------------------------------------------------- -.IF "$(L10N_framework)"=="" -TARFILE_NAME=$(TARGET)-$(FLUTE_VERSION) -TARFILE_MD5=d8bd5eed178db6e2b18eeed243f85aa8 -# TARFILE_ROOTDIR=$(TARGET) -TARFILE_IS_FLAT=true -PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch -CONVERTFILES=common_build.xml - -.IF "$(JAVACISGCJ)"=="yes" -JAVA_HOME= -.EXPORT : JAVA_HOME -BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(FLUTE_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar -.ELSE -BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(FLUTE_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar -.ENDIF - -.ENDIF # $(SOLAR_JAVA)!= "" - -# --- Targets ------------------------------------------------------ -.ENDIF - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk - -.IF "$(SOLAR_JAVA)" != "" -.INCLUDE : tg_ext.mk -.IF "$(L10N_framework)"=="" -ALLTAR : $(CLASSDIR)$/$(TARGET)-$(FLUTE_VERSION).jar - -$(PACKAGE_DIR)$/$(TARGET).patch : - @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir) - ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(FLUTE_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch ) - $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy - -$(CLASSDIR)$/$(TARGET)-$(FLUTE_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) - $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(FLUTE_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(FLUTE_VERSION).jar -.ENDIF -.ENDIF - |