From a4964c60117b031609072912c06720cca7bb4497 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Fri, 18 Oct 2013 18:51:26 +0200 Subject: fdo#70393: move jfreereport to a subdir of external Change-Id: I92d5458b48cc7e1c4794407bf71c54f0f048f2d8 Reviewed-on: https://gerrit.libreoffice.org/6325 Reviewed-by: David Tardon Tested-by: David Tardon --- RepositoryModule_host.mk | 1 - external/Module_external.mk | 1 + .../ExternalPackage_jfreereport_flow_engine.mk | 19 ++++ .../ExternalPackage_jfreereport_flute.mk | 19 ++++ .../ExternalPackage_jfreereport_libbase.mk | 19 ++++ .../ExternalPackage_jfreereport_libfonts.mk | 19 ++++ .../ExternalPackage_jfreereport_libformula.mk | 19 ++++ .../ExternalPackage_jfreereport_liblayout.mk | 19 ++++ .../ExternalPackage_jfreereport_libloader.mk | 19 ++++ .../ExternalPackage_jfreereport_librepository.mk | 19 ++++ .../ExternalPackage_jfreereport_libserializer.mk | 19 ++++ .../ExternalPackage_jfreereport_libxml.mk | 19 ++++ .../jfreereport/ExternalPackage_jfreereport_sac.mk | 16 ++++ .../ExternalProject_jfreereport_flow_engine.mk | 36 ++++++++ .../ExternalProject_jfreereport_flute.mk | 36 ++++++++ .../ExternalProject_jfreereport_libbase.mk | 36 ++++++++ .../ExternalProject_jfreereport_libfonts.mk | 36 ++++++++ .../ExternalProject_jfreereport_libformula.mk | 36 ++++++++ .../ExternalProject_jfreereport_liblayout.mk | 52 +++++++++++ .../ExternalProject_jfreereport_libloader.mk | 36 ++++++++ .../ExternalProject_jfreereport_librepository.mk | 36 ++++++++ .../ExternalProject_jfreereport_libserializer.mk | 36 ++++++++ .../ExternalProject_jfreereport_libxml.mk | 36 ++++++++ .../jfreereport/ExternalProject_jfreereport_sac.mk | 31 +++++++ external/jfreereport/Makefile | 7 ++ external/jfreereport/Module_jfreereport.mk | 48 ++++++++++ external/jfreereport/README | 1 + .../UnpackedTarball_jfreereport_flow_engine.mk | 22 +++++ .../UnpackedTarball_jfreereport_flute.mk | 22 +++++ .../UnpackedTarball_jfreereport_libbase.mk | 26 ++++++ .../UnpackedTarball_jfreereport_libfonts.mk | 26 ++++++ .../UnpackedTarball_jfreereport_libformula.mk | 23 +++++ .../UnpackedTarball_jfreereport_liblayout.mk | 22 +++++ .../UnpackedTarball_jfreereport_libloader.mk | 26 ++++++ .../UnpackedTarball_jfreereport_librepository.mk | 26 ++++++ .../UnpackedTarball_jfreereport_libserializer.mk | 22 +++++ .../UnpackedTarball_jfreereport_libxml.mk | 22 +++++ .../jfreereport/UnpackedTarball_jfreereport_sac.mk | 16 ++++ external/jfreereport/java/sac/build.xml | 64 +++++++++++++ .../nbprojects/flute/nbproject/project.xml | 42 +++++++++ .../jcommon-serializer/nbproject/project.xml | 42 +++++++++ .../nbprojects/jfreereport/nbproject/project.xml | 42 +++++++++ .../nbprojects/libfonts/nbproject/project.xml | 42 +++++++++ .../nbprojects/libformula/nbproject/project.xml | 42 +++++++++ .../nbprojects/liblayout/nbproject/project.xml | 42 +++++++++ .../nbprojects/libloader/nbproject/project.xml | 42 +++++++++ .../nbprojects/librepository/nbproject/project.xml | 42 +++++++++ .../nbprojects/libxml/nbproject/project.xml | 42 +++++++++ external/jfreereport/patches/common_build.patch | 102 +++++++++++++++++++++ external/jfreereport/patches/flow-engine.patch | 12 +++ .../patches/libbase-1.1.6-deprecated.patch | 11 +++ .../patches/libfonts-1.1.6-deprecated.patch | 11 +++ .../jfreereport/patches/libformula-time-notz.patch | 22 +++++ external/jfreereport/patches/liblayout.patch | 12 +++ .../patches/libloader-1.1.6-deprecated.patch | 11 +++ .../patches/librepository-1.1.6-deprecated.patch | 11 +++ external/jfreereport/patches/sac.patch | 73 +++++++++++++++ external/jfreereport/version.mk | 12 +++ .../ExternalPackage_jfreereport_flow_engine.mk | 19 ---- jfreereport/ExternalPackage_jfreereport_flute.mk | 19 ---- jfreereport/ExternalPackage_jfreereport_libbase.mk | 19 ---- .../ExternalPackage_jfreereport_libfonts.mk | 19 ---- .../ExternalPackage_jfreereport_libformula.mk | 19 ---- .../ExternalPackage_jfreereport_liblayout.mk | 19 ---- .../ExternalPackage_jfreereport_libloader.mk | 19 ---- .../ExternalPackage_jfreereport_librepository.mk | 19 ---- .../ExternalPackage_jfreereport_libserializer.mk | 19 ---- jfreereport/ExternalPackage_jfreereport_libxml.mk | 19 ---- jfreereport/ExternalPackage_jfreereport_sac.mk | 16 ---- .../ExternalProject_jfreereport_flow_engine.mk | 36 -------- jfreereport/ExternalProject_jfreereport_flute.mk | 36 -------- jfreereport/ExternalProject_jfreereport_libbase.mk | 36 -------- .../ExternalProject_jfreereport_libfonts.mk | 36 -------- .../ExternalProject_jfreereport_libformula.mk | 36 -------- .../ExternalProject_jfreereport_liblayout.mk | 52 ----------- .../ExternalProject_jfreereport_libloader.mk | 36 -------- .../ExternalProject_jfreereport_librepository.mk | 36 -------- .../ExternalProject_jfreereport_libserializer.mk | 36 -------- jfreereport/ExternalProject_jfreereport_libxml.mk | 36 -------- jfreereport/ExternalProject_jfreereport_sac.mk | 31 ------- jfreereport/Makefile | 7 -- jfreereport/Module_jfreereport.mk | 52 ----------- jfreereport/README | 1 - .../UnpackedTarball_jfreereport_flow_engine.mk | 22 ----- jfreereport/UnpackedTarball_jfreereport_flute.mk | 22 ----- jfreereport/UnpackedTarball_jfreereport_libbase.mk | 26 ------ .../UnpackedTarball_jfreereport_libfonts.mk | 26 ------ .../UnpackedTarball_jfreereport_libformula.mk | 23 ----- .../UnpackedTarball_jfreereport_liblayout.mk | 22 ----- .../UnpackedTarball_jfreereport_libloader.mk | 26 ------ .../UnpackedTarball_jfreereport_librepository.mk | 26 ------ .../UnpackedTarball_jfreereport_libserializer.mk | 22 ----- jfreereport/UnpackedTarball_jfreereport_libxml.mk | 22 ----- jfreereport/UnpackedTarball_jfreereport_sac.mk | 16 ---- jfreereport/java/sac/build.xml | 64 ------------- jfreereport/nbprojects/flute/nbproject/project.xml | 42 --------- .../jcommon-serializer/nbproject/project.xml | 42 --------- .../nbprojects/jfreereport/nbproject/project.xml | 42 --------- .../nbprojects/libfonts/nbproject/project.xml | 42 --------- .../nbprojects/libformula/nbproject/project.xml | 42 --------- .../nbprojects/liblayout/nbproject/project.xml | 42 --------- .../nbprojects/libloader/nbproject/project.xml | 42 --------- .../nbprojects/librepository/nbproject/project.xml | 42 --------- .../nbprojects/libxml/nbproject/project.xml | 42 --------- jfreereport/patches/common_build.patch | 102 --------------------- jfreereport/patches/flow-engine.patch | 12 --- jfreereport/patches/libbase-1.1.6-deprecated.patch | 11 --- .../patches/libfonts-1.1.6-deprecated.patch | 11 --- jfreereport/patches/libformula-time-notz.patch | 22 ----- jfreereport/patches/liblayout.patch | 12 --- .../patches/libloader-1.1.6-deprecated.patch | 11 --- .../patches/librepository-1.1.6-deprecated.patch | 11 --- jfreereport/patches/sac.patch | 73 --------------- jfreereport/version.mk | 12 --- 114 files changed, 1642 insertions(+), 1646 deletions(-) create mode 100644 external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk create mode 100644 external/jfreereport/ExternalPackage_jfreereport_flute.mk create mode 100644 external/jfreereport/ExternalPackage_jfreereport_libbase.mk create mode 100644 external/jfreereport/ExternalPackage_jfreereport_libfonts.mk create mode 100644 external/jfreereport/ExternalPackage_jfreereport_libformula.mk create mode 100644 external/jfreereport/ExternalPackage_jfreereport_liblayout.mk create mode 100644 external/jfreereport/ExternalPackage_jfreereport_libloader.mk create mode 100644 external/jfreereport/ExternalPackage_jfreereport_librepository.mk create mode 100644 external/jfreereport/ExternalPackage_jfreereport_libserializer.mk create mode 100644 external/jfreereport/ExternalPackage_jfreereport_libxml.mk create mode 100644 external/jfreereport/ExternalPackage_jfreereport_sac.mk create mode 100644 external/jfreereport/ExternalProject_jfreereport_flow_engine.mk create mode 100644 external/jfreereport/ExternalProject_jfreereport_flute.mk create mode 100644 external/jfreereport/ExternalProject_jfreereport_libbase.mk create mode 100644 external/jfreereport/ExternalProject_jfreereport_libfonts.mk create mode 100644 external/jfreereport/ExternalProject_jfreereport_libformula.mk create mode 100644 external/jfreereport/ExternalProject_jfreereport_liblayout.mk create mode 100644 external/jfreereport/ExternalProject_jfreereport_libloader.mk create mode 100644 external/jfreereport/ExternalProject_jfreereport_librepository.mk create mode 100644 external/jfreereport/ExternalProject_jfreereport_libserializer.mk create mode 100644 external/jfreereport/ExternalProject_jfreereport_libxml.mk create mode 100644 external/jfreereport/ExternalProject_jfreereport_sac.mk create mode 100644 external/jfreereport/Makefile create mode 100644 external/jfreereport/Module_jfreereport.mk create mode 100644 external/jfreereport/README create mode 100644 external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk create mode 100644 external/jfreereport/UnpackedTarball_jfreereport_flute.mk create mode 100644 external/jfreereport/UnpackedTarball_jfreereport_libbase.mk create mode 100644 external/jfreereport/UnpackedTarball_jfreereport_libfonts.mk create mode 100644 external/jfreereport/UnpackedTarball_jfreereport_libformula.mk create mode 100644 external/jfreereport/UnpackedTarball_jfreereport_liblayout.mk create mode 100644 external/jfreereport/UnpackedTarball_jfreereport_libloader.mk create mode 100644 external/jfreereport/UnpackedTarball_jfreereport_librepository.mk create mode 100644 external/jfreereport/UnpackedTarball_jfreereport_libserializer.mk create mode 100644 external/jfreereport/UnpackedTarball_jfreereport_libxml.mk create mode 100644 external/jfreereport/UnpackedTarball_jfreereport_sac.mk create mode 100644 external/jfreereport/java/sac/build.xml create mode 100644 external/jfreereport/nbprojects/flute/nbproject/project.xml create mode 100644 external/jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml create mode 100644 external/jfreereport/nbprojects/jfreereport/nbproject/project.xml create mode 100644 external/jfreereport/nbprojects/libfonts/nbproject/project.xml create mode 100644 external/jfreereport/nbprojects/libformula/nbproject/project.xml create mode 100644 external/jfreereport/nbprojects/liblayout/nbproject/project.xml create mode 100644 external/jfreereport/nbprojects/libloader/nbproject/project.xml create mode 100644 external/jfreereport/nbprojects/librepository/nbproject/project.xml create mode 100644 external/jfreereport/nbprojects/libxml/nbproject/project.xml create mode 100644 external/jfreereport/patches/common_build.patch create mode 100644 external/jfreereport/patches/flow-engine.patch create mode 100644 external/jfreereport/patches/libbase-1.1.6-deprecated.patch create mode 100644 external/jfreereport/patches/libfonts-1.1.6-deprecated.patch create mode 100644 external/jfreereport/patches/libformula-time-notz.patch create mode 100644 external/jfreereport/patches/liblayout.patch create mode 100644 external/jfreereport/patches/libloader-1.1.6-deprecated.patch create mode 100644 external/jfreereport/patches/librepository-1.1.6-deprecated.patch create mode 100644 external/jfreereport/patches/sac.patch create mode 100644 external/jfreereport/version.mk delete mode 100644 jfreereport/ExternalPackage_jfreereport_flow_engine.mk delete mode 100644 jfreereport/ExternalPackage_jfreereport_flute.mk delete mode 100644 jfreereport/ExternalPackage_jfreereport_libbase.mk delete mode 100644 jfreereport/ExternalPackage_jfreereport_libfonts.mk delete mode 100644 jfreereport/ExternalPackage_jfreereport_libformula.mk delete mode 100644 jfreereport/ExternalPackage_jfreereport_liblayout.mk delete mode 100644 jfreereport/ExternalPackage_jfreereport_libloader.mk delete mode 100644 jfreereport/ExternalPackage_jfreereport_librepository.mk delete mode 100644 jfreereport/ExternalPackage_jfreereport_libserializer.mk delete mode 100644 jfreereport/ExternalPackage_jfreereport_libxml.mk delete mode 100644 jfreereport/ExternalPackage_jfreereport_sac.mk delete mode 100644 jfreereport/ExternalProject_jfreereport_flow_engine.mk delete mode 100644 jfreereport/ExternalProject_jfreereport_flute.mk delete mode 100644 jfreereport/ExternalProject_jfreereport_libbase.mk delete mode 100644 jfreereport/ExternalProject_jfreereport_libfonts.mk delete mode 100644 jfreereport/ExternalProject_jfreereport_libformula.mk delete mode 100644 jfreereport/ExternalProject_jfreereport_liblayout.mk delete mode 100644 jfreereport/ExternalProject_jfreereport_libloader.mk delete mode 100644 jfreereport/ExternalProject_jfreereport_librepository.mk delete mode 100644 jfreereport/ExternalProject_jfreereport_libserializer.mk delete mode 100644 jfreereport/ExternalProject_jfreereport_libxml.mk delete mode 100644 jfreereport/ExternalProject_jfreereport_sac.mk delete mode 100644 jfreereport/Makefile delete mode 100644 jfreereport/Module_jfreereport.mk delete mode 100644 jfreereport/README delete mode 100644 jfreereport/UnpackedTarball_jfreereport_flow_engine.mk delete mode 100644 jfreereport/UnpackedTarball_jfreereport_flute.mk delete mode 100644 jfreereport/UnpackedTarball_jfreereport_libbase.mk delete mode 100644 jfreereport/UnpackedTarball_jfreereport_libfonts.mk delete mode 100644 jfreereport/UnpackedTarball_jfreereport_libformula.mk delete mode 100644 jfreereport/UnpackedTarball_jfreereport_liblayout.mk delete mode 100644 jfreereport/UnpackedTarball_jfreereport_libloader.mk delete mode 100644 jfreereport/UnpackedTarball_jfreereport_librepository.mk delete mode 100644 jfreereport/UnpackedTarball_jfreereport_libserializer.mk delete mode 100644 jfreereport/UnpackedTarball_jfreereport_libxml.mk delete mode 100644 jfreereport/UnpackedTarball_jfreereport_sac.mk delete mode 100644 jfreereport/java/sac/build.xml delete mode 100644 jfreereport/nbprojects/flute/nbproject/project.xml delete mode 100644 jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml delete mode 100644 jfreereport/nbprojects/jfreereport/nbproject/project.xml delete mode 100644 jfreereport/nbprojects/libfonts/nbproject/project.xml delete mode 100644 jfreereport/nbprojects/libformula/nbproject/project.xml delete mode 100644 jfreereport/nbprojects/liblayout/nbproject/project.xml delete mode 100644 jfreereport/nbprojects/libloader/nbproject/project.xml delete mode 100644 jfreereport/nbprojects/librepository/nbproject/project.xml delete mode 100644 jfreereport/nbprojects/libxml/nbproject/project.xml delete mode 100644 jfreereport/patches/common_build.patch delete mode 100644 jfreereport/patches/flow-engine.patch delete mode 100644 jfreereport/patches/libbase-1.1.6-deprecated.patch delete mode 100644 jfreereport/patches/libfonts-1.1.6-deprecated.patch delete mode 100644 jfreereport/patches/libformula-time-notz.patch delete mode 100644 jfreereport/patches/liblayout.patch delete mode 100644 jfreereport/patches/libloader-1.1.6-deprecated.patch delete mode 100644 jfreereport/patches/librepository-1.1.6-deprecated.patch delete mode 100644 jfreereport/patches/sac.patch delete mode 100644 jfreereport/version.mk diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index f4c30554ccba..fe4fc94ebb59 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -65,7 +65,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ instsetoo_native \ io \ javaunohelper \ - $(call gb_Helper_optional,JFREEREPORT,jfreereport) \ $(call gb_Helper_optional,JPEG,jpeg) \ jurt \ jvmaccess \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 26b93ad61d38..6764ac4126b3 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,HUNSPELL,hunspell) \ $(call gb_Helper_optional,HYPHEN,hyphen) \ $(call gb_Helper_optional,ICU,icu) \ + $(call gb_Helper_optional,JFREEREPORT,jfreereport) \ $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \ $(call gb_Helper_optional,LIBPNG,libpng) \ )) diff --git a/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk b/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk new file mode 100644 index 000000000000..1482967b91c0 --- /dev/null +++ b/external/jfreereport/ExternalPackage_jfreereport_flow_engine.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)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_flow_engine,jfreereport_flow_engine)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_flow_engine,jfreereport_flow_engine)) + +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_flow_engine,bin/flow-engine-$(FLOW_ENGINE_VERSION).jar,build/lib/flow-engine.jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_flute.mk b/external/jfreereport/ExternalPackage_jfreereport_flute.mk new file mode 100644 index 000000000000..f0196a8c9052 --- /dev/null +++ b/external/jfreereport/ExternalPackage_jfreereport_flute.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)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_flute,jfreereport_flute)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_flute,jfreereport_flute)) + +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_flute,bin/flute-$(FLUTE_VERSION).jar,dist/flute-$(FLUTE_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_libbase.mk b/external/jfreereport/ExternalPackage_jfreereport_libbase.mk new file mode 100644 index 000000000000..0f6ee51d93fa --- /dev/null +++ b/external/jfreereport/ExternalPackage_jfreereport_libbase.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)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libbase,jfreereport_libbase)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libbase,jfreereport_libbase)) + +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libbase,bin/libbase-$(LIBBASE_VERSION).jar,dist/libbase-$(LIBBASE_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_libfonts.mk b/external/jfreereport/ExternalPackage_jfreereport_libfonts.mk new file mode 100644 index 000000000000..c097e76bf50c --- /dev/null +++ b/external/jfreereport/ExternalPackage_jfreereport_libfonts.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)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libfonts,jfreereport_libfonts)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libfonts,jfreereport_libfonts)) + +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libfonts,bin/libfonts-$(LIBFONTS_VERSION).jar,dist/libfonts-$(LIBFONTS_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_libformula.mk b/external/jfreereport/ExternalPackage_jfreereport_libformula.mk new file mode 100644 index 000000000000..4e4266ca4033 --- /dev/null +++ b/external/jfreereport/ExternalPackage_jfreereport_libformula.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)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libformula,jfreereport_libformula)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libformula,jfreereport_libformula)) + +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libformula,bin/libformula-$(LIBFORMULA_VERSION).jar,dist/libformula-$(LIBFORMULA_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk b/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk new file mode 100644 index 000000000000..fc19dd1554fb --- /dev/null +++ b/external/jfreereport/ExternalPackage_jfreereport_liblayout.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)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_liblayout,jfreereport_liblayout)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_liblayout,jfreereport_liblayout)) + +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_liblayout,bin/liblayout-$(LIBLAYOUT_VERSION).jar,build/lib/liblayout.jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_libloader.mk b/external/jfreereport/ExternalPackage_jfreereport_libloader.mk new file mode 100644 index 000000000000..01f1bcc62b09 --- /dev/null +++ b/external/jfreereport/ExternalPackage_jfreereport_libloader.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)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libloader,jfreereport_libloader)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libloader,jfreereport_libloader)) + +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libloader,bin/libloader-$(LIBLOADER_VERSION).jar,dist/libloader-$(LIBLOADER_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_librepository.mk b/external/jfreereport/ExternalPackage_jfreereport_librepository.mk new file mode 100644 index 000000000000..4103811ba3ee --- /dev/null +++ b/external/jfreereport/ExternalPackage_jfreereport_librepository.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)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_librepository,jfreereport_librepository)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_librepository,jfreereport_librepository)) + +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_librepository,bin/librepository-$(LIBREPOSITORY_VERSION).jar,dist/librepository-$(LIBREPOSITORY_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_libserializer.mk b/external/jfreereport/ExternalPackage_jfreereport_libserializer.mk new file mode 100644 index 000000000000..f576ed7b3d14 --- /dev/null +++ b/external/jfreereport/ExternalPackage_jfreereport_libserializer.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)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libserializer,jfreereport_libserializer)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libserializer,jfreereport_libserializer)) + +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libserializer,bin/libserializer-$(LIBBASE_VERSION).jar,dist/libserializer-$(LIBBASE_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_libxml.mk b/external/jfreereport/ExternalPackage_jfreereport_libxml.mk new file mode 100644 index 000000000000..6425911a42cb --- /dev/null +++ b/external/jfreereport/ExternalPackage_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)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libxml,jfreereport_libxml)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libxml,jfreereport_libxml)) + +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libxml,bin/libxml-$(LIBXML_VERSION).jar,dist/libxml-$(LIBXML_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_sac.mk b/external/jfreereport/ExternalPackage_jfreereport_sac.mk new file mode 100644 index 000000000000..1f8df20e4db6 --- /dev/null +++ b/external/jfreereport/ExternalPackage_jfreereport_sac.mk @@ -0,0 +1,16 @@ +# -*- 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/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_sac,jfreereport_sac)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_sac,jfreereport_sac)) + +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_sac,bin/sac.jar,build/lib/sac.jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk new file mode 100644 index 000000000000..08b86134cedc --- /dev/null +++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk @@ -0,0 +1,36 @@ +# -*- 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/. +# + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flow_engine)) + +$(eval $(call gb_ExternalProject_use_packages,jfreereport_flow_engine,\ + jfreereport_liblayout \ +)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_flow_engine,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) : + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) )\ + -Dlib=$(OUTDIR)/bin \ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + $(if $(debug),-Dbuild.debug="on") jar \ + ) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_flute.mk b/external/jfreereport/ExternalProject_jfreereport_flute.mk new file mode 100644 index 000000000000..f2a559c649ef --- /dev/null +++ b/external/jfreereport/ExternalProject_jfreereport_flute.mk @@ -0,0 +1,36 @@ +# -*- 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)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flute)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_flute,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_flute,build) : + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + $(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="$(FLUTE_VERSION)" \ + $(if $(debug),-Dbuild.debug="on") jar \ + ) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_libbase.mk b/external/jfreereport/ExternalProject_jfreereport_libbase.mk new file mode 100644 index 000000000000..8f1ec0884777 --- /dev/null +++ b/external/jfreereport/ExternalProject_jfreereport_libbase.mk @@ -0,0 +1,36 @@ +# -*- 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)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libbase)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_libbase,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_libbase,build) : + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + $(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="$(LIBBASE_VERSION)" \ + $(if $(debug),-Dbuild.debug="on") jar \ + ) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_libfonts.mk b/external/jfreereport/ExternalProject_jfreereport_libfonts.mk new file mode 100644 index 000000000000..ad38cd98ca18 --- /dev/null +++ b/external/jfreereport/ExternalProject_jfreereport_libfonts.mk @@ -0,0 +1,36 @@ +# -*- 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)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libfonts)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_libfonts,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_libfonts,build) : + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + $(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="$(LIBFONTS_VERSION)" \ + $(if $(debug),-Dbuild.debug="on") jar \ + ) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_libformula.mk b/external/jfreereport/ExternalProject_jfreereport_libformula.mk new file mode 100644 index 000000000000..90d8b4d7da8f --- /dev/null +++ b/external/jfreereport/ExternalProject_jfreereport_libformula.mk @@ -0,0 +1,36 @@ +# -*- 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)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libformula)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_libformula,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_libformula,build) : + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + $(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="$(LIBFORMULA_VERSION)" \ + $(if $(debug),-Dbuild.debug="on") jar \ + ) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk new file mode 100644 index 000000000000..cddbef1d32ed --- /dev/null +++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk @@ -0,0 +1,52 @@ +# -*- 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/. +# + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_liblayout)) + +ifneq ($(SYSTEM_APACHE_COMMONS),YES) +$(eval $(call gb_ExternalProject_use_packages,jfreereport_liblayout,\ + apache_commons_logging_inc \ +)) +endif + +$(eval $(call gb_ExternalProject_use_packages,jfreereport_liblayout,\ + jfreereport_sac \ + jfreereport_libbase \ + jfreereport_flute \ + jfreereport_libloader \ + jfreereport_libxml \ + jfreereport_libformula \ + jfreereport_libfonts \ + jfreereport_librepository \ + jfreereport_libserializer \ +)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_liblayout,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) : + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) )\ + $(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" \ + -Dlib=$(OUTDIR)/bin \ + $(if $(debug),-Dbuild.debug="on") jar \ + ) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_libloader.mk b/external/jfreereport/ExternalProject_jfreereport_libloader.mk new file mode 100644 index 000000000000..2b860b8aa7a6 --- /dev/null +++ b/external/jfreereport/ExternalProject_jfreereport_libloader.mk @@ -0,0 +1,36 @@ +# -*- 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)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libloader)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_libloader,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_libloader,build) : + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + $(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 \ + ) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_librepository.mk b/external/jfreereport/ExternalProject_jfreereport_librepository.mk new file mode 100644 index 000000000000..21611e45ccd9 --- /dev/null +++ b/external/jfreereport/ExternalProject_jfreereport_librepository.mk @@ -0,0 +1,36 @@ +# -*- 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)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_librepository)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_librepository,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_librepository,build) : + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + $(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="$(LIBREPOSITORY_VERSION)" \ + $(if $(debug),-Dbuild.debug="on") jar \ + ) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_libserializer.mk b/external/jfreereport/ExternalProject_jfreereport_libserializer.mk new file mode 100644 index 000000000000..2b0c951a7227 --- /dev/null +++ b/external/jfreereport/ExternalProject_jfreereport_libserializer.mk @@ -0,0 +1,36 @@ +# -*- 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)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libserializer)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_libserializer,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_libserializer,build) : + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)." \ + $(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="$(LIBSERIALIZER_VERSION)" \ + $(if $(debug),-Dbuild.debug="on") jar \ + ) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_libxml.mk b/external/jfreereport/ExternalProject_jfreereport_libxml.mk new file mode 100644 index 000000000000..0cb2d7e38a5b --- /dev/null +++ b/external/jfreereport/ExternalProject_jfreereport_libxml.mk @@ -0,0 +1,36 @@ +# -*- 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)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libxml)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_libxml,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_libxml,build) : + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + $(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="$(LIBXML_VERSION)" \ + $(if $(debug),-Dbuild.debug="on") jar \ + ) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_sac.mk b/external/jfreereport/ExternalProject_jfreereport_sac.mk new file mode 100644 index 000000000000..72783a175317 --- /dev/null +++ b/external/jfreereport/ExternalProject_jfreereport_sac.mk @@ -0,0 +1,31 @@ +# -*- 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/. +# + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_sac)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_sac,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_sac,build) : + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + -Dantcontrib.available="true" \ + $(if $(debug),-Dbuild.debug="on") all \ + ) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/Makefile b/external/jfreereport/Makefile new file mode 100644 index 000000000000..e4968cf85fb6 --- /dev/null +++ b/external/jfreereport/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/Module_jfreereport.mk b/external/jfreereport/Module_jfreereport.mk new file mode 100644 index 000000000000..5a4431ecc4da --- /dev/null +++ b/external/jfreereport/Module_jfreereport.mk @@ -0,0 +1,48 @@ +# -*- 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/. +# + +$(eval $(call gb_Module_Module,jfreereport)) + +$(eval $(call gb_Module_add_targets,jfreereport,\ + ExternalPackage_jfreereport_flow_engine \ + ExternalPackage_jfreereport_flute \ + ExternalPackage_jfreereport_libbase \ + ExternalPackage_jfreereport_libfonts \ + ExternalPackage_jfreereport_libformula \ + ExternalPackage_jfreereport_liblayout \ + ExternalPackage_jfreereport_libloader \ + ExternalPackage_jfreereport_librepository \ + ExternalPackage_jfreereport_libserializer \ + ExternalPackage_jfreereport_libxml \ + ExternalPackage_jfreereport_sac \ + ExternalProject_jfreereport_flow_engine \ + ExternalProject_jfreereport_flute \ + ExternalProject_jfreereport_libbase \ + ExternalProject_jfreereport_libfonts \ + ExternalProject_jfreereport_libformula \ + ExternalProject_jfreereport_liblayout \ + ExternalProject_jfreereport_libloader \ + ExternalProject_jfreereport_librepository \ + ExternalProject_jfreereport_libserializer \ + ExternalProject_jfreereport_libxml \ + ExternalProject_jfreereport_sac \ + UnpackedTarball_jfreereport_flow_engine \ + UnpackedTarball_jfreereport_flute \ + UnpackedTarball_jfreereport_libbase \ + UnpackedTarball_jfreereport_libfonts \ + UnpackedTarball_jfreereport_libformula \ + UnpackedTarball_jfreereport_liblayout \ + UnpackedTarball_jfreereport_libloader \ + UnpackedTarball_jfreereport_librepository \ + UnpackedTarball_jfreereport_libserializer \ + UnpackedTarball_jfreereport_libxml \ + UnpackedTarball_jfreereport_sac \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/README b/external/jfreereport/README new file mode 100644 index 000000000000..228577060d83 --- /dev/null +++ b/external/jfreereport/README @@ -0,0 +1 @@ +Java library providing basic functionality for the report builder, from [http://www.object-refinery.com/jfreereport/] diff --git a/external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk b/external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk new file mode 100644 index 000000000000..f6640e46f775 --- /dev/null +++ b/external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk @@ -0,0 +1,22 @@ +# -*- 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/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_flow_engine)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_flow_engine,$(JFREEREPORT_FLOW_ENGINE_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_flow_engine,\ + build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_flow_engine,\ + external/jfreereport/patches/flow-engine.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/UnpackedTarball_jfreereport_flute.mk b/external/jfreereport/UnpackedTarball_jfreereport_flute.mk new file mode 100644 index 000000000000..a972e21aabc0 --- /dev/null +++ b/external/jfreereport/UnpackedTarball_jfreereport_flute.mk @@ -0,0 +1,22 @@ +# -*- 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/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_flute)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_flute,$(JFREEREPORT_FLUTE_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_flute,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_flute,\ + external/jfreereport/patches/common_build.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/UnpackedTarball_jfreereport_libbase.mk b/external/jfreereport/UnpackedTarball_jfreereport_libbase.mk new file mode 100644 index 000000000000..c3ba35190ede --- /dev/null +++ b/external/jfreereport/UnpackedTarball_jfreereport_libbase.mk @@ -0,0 +1,26 @@ +# -*- 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)/external/jfreereport/version.mk + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libbase)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libbase,$(JFREEREPORT_LIBBASE_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libbase,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libbase,\ + external/jfreereport/patches/common_build.patch \ + external/jfreereport/patches/libbase-$(LIBBASE_VERSION)-deprecated.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/UnpackedTarball_jfreereport_libfonts.mk b/external/jfreereport/UnpackedTarball_jfreereport_libfonts.mk new file mode 100644 index 000000000000..b648c58bbef8 --- /dev/null +++ b/external/jfreereport/UnpackedTarball_jfreereport_libfonts.mk @@ -0,0 +1,26 @@ +# -*- 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)/external/jfreereport/version.mk + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libfonts)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libfonts,$(JFREEREPORT_LIBFONTS_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libfonts,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libfonts,\ + external/jfreereport/patches/common_build.patch \ + external/jfreereport/patches/libfonts-$(LIBFONTS_VERSION)-deprecated.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk b/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk new file mode 100644 index 000000000000..2bc3229e54f7 --- /dev/null +++ b/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk @@ -0,0 +1,23 @@ +# -*- 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/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libformula)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libformula,$(JFREEREPORT_LIBFORMULA_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libformula,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libformula,\ + external/jfreereport/patches/common_build.patch \ + external/jfreereport/patches/libformula-time-notz.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/UnpackedTarball_jfreereport_liblayout.mk b/external/jfreereport/UnpackedTarball_jfreereport_liblayout.mk new file mode 100644 index 000000000000..7281ba59b353 --- /dev/null +++ b/external/jfreereport/UnpackedTarball_jfreereport_liblayout.mk @@ -0,0 +1,22 @@ +# -*- 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/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_liblayout)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_liblayout,$(JFREEREPORT_LIBLAYOUT_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_liblayout,\ + build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_liblayout,\ + external/jfreereport/patches/liblayout.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/UnpackedTarball_jfreereport_libloader.mk b/external/jfreereport/UnpackedTarball_jfreereport_libloader.mk new file mode 100644 index 000000000000..7357ddd03ad9 --- /dev/null +++ b/external/jfreereport/UnpackedTarball_jfreereport_libloader.mk @@ -0,0 +1,26 @@ +# -*- 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)/external/jfreereport/version.mk + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libloader)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libloader,$(JFREEREPORT_LIBLOADER_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libloader,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libloader,\ + external/jfreereport/patches/common_build.patch \ + external/jfreereport/patches/libloader-$(LIBLOADER_VERSION)-deprecated.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/UnpackedTarball_jfreereport_librepository.mk b/external/jfreereport/UnpackedTarball_jfreereport_librepository.mk new file mode 100644 index 000000000000..86ff991b9f3e --- /dev/null +++ b/external/jfreereport/UnpackedTarball_jfreereport_librepository.mk @@ -0,0 +1,26 @@ +# -*- 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)/external/jfreereport/version.mk + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_librepository)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_librepository,$(JFREEREPORT_LIBREPOSITORY_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_librepository,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_librepository,\ + external/jfreereport/patches/common_build.patch \ + external/jfreereport/patches/librepository-$(LIBREPOSITORY_VERSION)-deprecated.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/UnpackedTarball_jfreereport_libserializer.mk b/external/jfreereport/UnpackedTarball_jfreereport_libserializer.mk new file mode 100644 index 000000000000..22d6d0cb7a2a --- /dev/null +++ b/external/jfreereport/UnpackedTarball_jfreereport_libserializer.mk @@ -0,0 +1,22 @@ +# -*- 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/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libserializer)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libserializer,$(JFREEREPORT_LIBSERIALIZER_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libserializer,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libserializer,\ + external/jfreereport/patches/common_build.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/UnpackedTarball_jfreereport_libxml.mk b/external/jfreereport/UnpackedTarball_jfreereport_libxml.mk new file mode 100644 index 000000000000..ceca692adee2 --- /dev/null +++ b/external/jfreereport/UnpackedTarball_jfreereport_libxml.mk @@ -0,0 +1,22 @@ +# -*- 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/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libxml)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libxml,$(JFREEREPORT_LIBXML_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libxml,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libxml,\ + external/jfreereport/patches/common_build.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/UnpackedTarball_jfreereport_sac.mk b/external/jfreereport/UnpackedTarball_jfreereport_sac.mk new file mode 100644 index 000000000000..eb951663db4c --- /dev/null +++ b/external/jfreereport/UnpackedTarball_jfreereport_sac.mk @@ -0,0 +1,16 @@ +# -*- 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/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_sac)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_sac,$(JFREEREPORT_SAC_TARBALL))) + +$(eval $(call gb_UnpackedTarball_add_file,jfreereport_sac,build.xml,external/jfreereport/java/sac/build.xml)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/java/sac/build.xml b/external/jfreereport/java/sac/build.xml new file mode 100644 index 000000000000..0e85dff04f3a --- /dev/null +++ b/external/jfreereport/java/sac/build.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/external/jfreereport/nbprojects/flute/nbproject/project.xml b/external/jfreereport/nbprojects/flute/nbproject/project.xml new file mode 100644 index 000000000000..4280b91022ab --- /dev/null +++ b/external/jfreereport/nbprojects/flute/nbproject/project.xml @@ -0,0 +1,42 @@ + + + org.netbeans.modules.ant.freeform + + + + flute-13a + + ../../wntmsci10/misc/build/flute + ${project.dir}/ant/build.xml + + + + + ${project.dir} + + + + + + all + + + + javadoc + + + + + + ${ant.script} + + + + + + + + + + + diff --git a/external/jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml b/external/jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml new file mode 100644 index 000000000000..f7a14ae8712f --- /dev/null +++ b/external/jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml @@ -0,0 +1,42 @@ + + + org.netbeans.modules.ant.freeform + + + + jcommon-serializer + + ../../wntmsci10/misc/build/jcommon-serializer + ${project.dir}/ant/build.xml + + + + + ${project.dir} + + + + + + all + + + + javadoc + + + + + + ${ant.script} + + + + + + + + + + + diff --git a/external/jfreereport/nbprojects/jfreereport/nbproject/project.xml b/external/jfreereport/nbprojects/jfreereport/nbproject/project.xml new file mode 100644 index 000000000000..8f6074cfb8d8 --- /dev/null +++ b/external/jfreereport/nbprojects/jfreereport/nbproject/project.xml @@ -0,0 +1,42 @@ + + + org.netbeans.modules.ant.freeform + + + + jfreereport + + ../../wntmsci10/misc/build/jfreereport + ${project.dir}/ant/build.xml + + + + + ${project.dir} + + + + + + all + + + + javadoc + + + + + + ${ant.script} + + + + + + + + + + + diff --git a/external/jfreereport/nbprojects/libfonts/nbproject/project.xml b/external/jfreereport/nbprojects/libfonts/nbproject/project.xml new file mode 100644 index 000000000000..d84bfb7f832b --- /dev/null +++ b/external/jfreereport/nbprojects/libfonts/nbproject/project.xml @@ -0,0 +1,42 @@ + + + org.netbeans.modules.ant.freeform + + + + libfonts + + ../../wntmsci10/misc/build/libfonts + ${project.dir}/ant/build.xml + + + + + ${project.dir} + + + + + + all + + + + javadoc + + + + + + ${ant.script} + + + + + + + + + + + diff --git a/external/jfreereport/nbprojects/libformula/nbproject/project.xml b/external/jfreereport/nbprojects/libformula/nbproject/project.xml new file mode 100644 index 000000000000..e056200ee16e --- /dev/null +++ b/external/jfreereport/nbprojects/libformula/nbproject/project.xml @@ -0,0 +1,42 @@ + + + org.netbeans.modules.ant.freeform + + + + libformula + + ../../wntmsci10/misc/build/libformula + ${project.dir}/ant/build.xml + + + + + ${project.dir} + + + + + + all + + + + javadoc + + + + + + ${ant.script} + + + + + + + + + + + diff --git a/external/jfreereport/nbprojects/liblayout/nbproject/project.xml b/external/jfreereport/nbprojects/liblayout/nbproject/project.xml new file mode 100644 index 000000000000..63ad9ef3f420 --- /dev/null +++ b/external/jfreereport/nbprojects/liblayout/nbproject/project.xml @@ -0,0 +1,42 @@ + + + org.netbeans.modules.ant.freeform + + + + liblayout + + ../../wntmsci10/misc/build/liblayout + ${project.dir}/ant/build.xml + + + + + ${project.dir} + + + + + + all + + + + javadoc + + + + + + ${ant.script} + + + + + + + + + + + diff --git a/external/jfreereport/nbprojects/libloader/nbproject/project.xml b/external/jfreereport/nbprojects/libloader/nbproject/project.xml new file mode 100644 index 000000000000..6b06d5686759 --- /dev/null +++ b/external/jfreereport/nbprojects/libloader/nbproject/project.xml @@ -0,0 +1,42 @@ + + + org.netbeans.modules.ant.freeform + + + + libloader + + ../../wntmsci10/misc/build/libloader + ${project.dir}/ant/build.xml + + + + + ${project.dir} + + + + + + all + + + + javadoc + + + + + + ${ant.script} + + + + + + + + + + + diff --git a/external/jfreereport/nbprojects/librepository/nbproject/project.xml b/external/jfreereport/nbprojects/librepository/nbproject/project.xml new file mode 100644 index 000000000000..c1b92593de3f --- /dev/null +++ b/external/jfreereport/nbprojects/librepository/nbproject/project.xml @@ -0,0 +1,42 @@ + + + org.netbeans.modules.ant.freeform + + + + librepository + + ../../wntmsci10/misc/build/librepository + ${project.dir}/ant/build.xml + + + + + ${project.dir} + + + + + + all + + + + javadoc + + + + + + ${ant.script} + + + + + + + + + + + diff --git a/external/jfreereport/nbprojects/libxml/nbproject/project.xml b/external/jfreereport/nbprojects/libxml/nbproject/project.xml new file mode 100644 index 000000000000..6b966c904cd3 --- /dev/null +++ b/external/jfreereport/nbprojects/libxml/nbproject/project.xml @@ -0,0 +1,42 @@ + + + org.netbeans.modules.ant.freeform + + + + libxml + + ../../wntmsci10/misc/build/libxml + ${project.dir}/ant/build.xml + + + + + ${project.dir} + + + + + + all + + + + javadoc + + + + + + ${ant.script} + + + + + + + + + + + diff --git a/external/jfreereport/patches/common_build.patch b/external/jfreereport/patches/common_build.patch new file mode 100644 index 000000000000..2bc54595cf17 --- /dev/null +++ b/external/jfreereport/patches/common_build.patch @@ -0,0 +1,102 @@ +--- misc/libloader-1.1.3/common_build.xml 2009-11-16 10:25:34.000000000 +0100 ++++ misc/build/libloader-1.1.3/common_build.xml 2009-12-04 10:22:24.277647200 +0100 +@@ -261,7 +261,7 @@ TYPICAL TARGET SEQUENCE + + + +- ++ + + + +@@ -270,7 +270,7 @@ TYPICAL TARGET SEQUENCE + + + +- ++ + + + +@@ -497,7 +497,7 @@ + Sets a property build.id to the either "development" or the svn revision + if in release mode + ====================================================================--> +- ++ + + + +@@ -1061,6 +1061,11 @@ + Performs the actual compile + ====================================================================--> + ++ ++ ++ ++ ++ + +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ + +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + + +- ++ ++ + + + diff --git a/external/jfreereport/patches/libbase-1.1.6-deprecated.patch b/external/jfreereport/patches/libbase-1.1.6-deprecated.patch new file mode 100644 index 000000000000..da28c30eb70e --- /dev/null +++ b/external/jfreereport/patches/libbase-1.1.6-deprecated.patch @@ -0,0 +1,11 @@ +--- misc/libbase-1.1.6/source/org/pentaho/reporting/libraries/base/boot/ModuleInitializeException.java 2010-04-27 15:58:44.000000000 +0200 ++++ misc/build/libbase-1.1.6/source/org/pentaho/reporting/libraries/base/boot/ModuleInitializeException.java 2011-06-13 01:28:14.000000000 +0200 +@@ -48,7 +48,7 @@ + */ + public ModuleInitializeException(final String s, final Exception e) + { +- super(s, e); ++ super(s, (Throwable) e); + } + + /** diff --git a/external/jfreereport/patches/libfonts-1.1.6-deprecated.patch b/external/jfreereport/patches/libfonts-1.1.6-deprecated.patch new file mode 100644 index 000000000000..eb2ab8c76c10 --- /dev/null +++ b/external/jfreereport/patches/libfonts-1.1.6-deprecated.patch @@ -0,0 +1,11 @@ +--- misc/libfonts-1.1.6/source/org/pentaho/reporting/libraries/fonts/FontException.java 2010-04-27 16:09:00.000000000 +0200 ++++ misc/build/libfonts-1.1.6/source/org/pentaho/reporting/libraries/fonts/FontException.java 2011-06-13 02:04:51.000000000 +0200 +@@ -39,7 +39,7 @@ + */ + public FontException(final String message, final Exception ex) + { +- super(message, ex); ++ super(message, (Throwable) ex); + } + + /** diff --git a/external/jfreereport/patches/libformula-time-notz.patch b/external/jfreereport/patches/libformula-time-notz.patch new file mode 100644 index 000000000000..fec65b17e1a6 --- /dev/null +++ b/external/jfreereport/patches/libformula-time-notz.patch @@ -0,0 +1,22 @@ +--- a/jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/DefaultLocalizationContext.java 2010-06-01 17:15:52.000000000 +0200 ++++ a/jfreereport_libformula.patched/source/org/pentaho/reporting/libraries/formula/DefaultLocalizationContext.java 2013-08-06 13:11:58.000000000 +0200 +@@ -162,11 +169,17 @@ + final Locale activeLocale = getLocale(); + datetimeFormats.add(DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL, activeLocale)); + dateFormats.add(DateFormat.getDateInstance(DateFormat.FULL, activeLocale)); +- timeFormats.add(DateFormat.getTimeInstance(DateFormat.FULL, activeLocale)); ++ // LEM: "FULL" does not really make sense for isolated times: ++ // in the absence of a date, it cannot know whether it is meant in the winter-timezone ++ // or in the summer (daylight saving time) timezone, and will always display the winter timezone. ++ // timeFormats.add(DateFormat.getTimeInstance(DateFormat.FULL, activeLocale)); + + datetimeFormats.add(DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG, activeLocale)); + dateFormats.add(DateFormat.getDateInstance(DateFormat.LONG, activeLocale)); +- timeFormats.add(DateFormat.getTimeInstance(DateFormat.LONG, activeLocale)); ++ // LEM: "LONG" does not really make sense for isolated times: ++ // in the absence of a date, it cannot know whether it is meant in the winter-timezone ++ // or in the summer (daylight saving time) timezone, and will always display the winter timezone. ++ // timeFormats.add(DateFormat.getTimeInstance(DateFormat.LONG, activeLocale)); + + datetimeFormats.add(DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM, activeLocale)); + dateFormats.add(DateFormat.getDateInstance(DateFormat.MEDIUM, activeLocale)); diff --git a/external/jfreereport/patches/liblayout.patch b/external/jfreereport/patches/liblayout.patch new file mode 100644 index 000000000000..035d99bd3b96 --- /dev/null +++ b/external/jfreereport/patches/liblayout.patch @@ -0,0 +1,12 @@ +--- misc/liblayout-0.2.10/build.xml (Revision 6728) ++++ misc/build/liblayout-0.2.10/build.xml (Arbeitskopie) +@@ -24,7 +24,8 @@ + + + +- ++ ++ + + + diff --git a/external/jfreereport/patches/libloader-1.1.6-deprecated.patch b/external/jfreereport/patches/libloader-1.1.6-deprecated.patch new file mode 100644 index 000000000000..c098906fcf70 --- /dev/null +++ b/external/jfreereport/patches/libloader-1.1.6-deprecated.patch @@ -0,0 +1,11 @@ +--- misc/libloader-1.1.6/source/org/pentaho/reporting/libraries/resourceloader/ResourceException.java 2010-04-27 16:07:00.000000000 +0200 ++++ misc/build/libloader-1.1.6/source/org/pentaho/reporting/libraries/resourceloader/ResourceException.java 2011-06-13 02:00:46.000000000 +0200 +@@ -42,7 +42,7 @@ + */ + public ResourceException(final String message, final Exception ex) + { +- super(message, ex); ++ super(message, (Throwable) ex); + } + + /** diff --git a/external/jfreereport/patches/librepository-1.1.6-deprecated.patch b/external/jfreereport/patches/librepository-1.1.6-deprecated.patch new file mode 100644 index 000000000000..a266efc4bb79 --- /dev/null +++ b/external/jfreereport/patches/librepository-1.1.6-deprecated.patch @@ -0,0 +1,11 @@ +--- misc/librepository-1.1.6/source/org/pentaho/reporting/libraries/repository/ContentIOException.java 2010-04-27 16:04:50.000000000 +0200 ++++ misc/build/librepository-1.1.6/source/org/pentaho/reporting/libraries/repository/ContentIOException.java 2011-06-13 01:44:35.000000000 +0200 +@@ -43,7 +43,7 @@ + */ + public ContentIOException(final String message, final Exception ex) + { +- super(message, ex); ++ super(message, (Throwable) ex); + } + + /** diff --git a/external/jfreereport/patches/sac.patch b/external/jfreereport/patches/sac.patch new file mode 100644 index 000000000000..77db8511acbe --- /dev/null +++ b/external/jfreereport/patches/sac.patch @@ -0,0 +1,73 @@ +*** misc/sac-1.3/build.xml Thu Oct 18 09:22:24 2007 +--- misc/build/sac-1.3/build.xml Thu Oct 18 08:53:59 2007 +*************** +*** 1 **** +! dummy +--- 1,66 ---- +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +! +\ No newline at end of file diff --git a/external/jfreereport/version.mk b/external/jfreereport/version.mk new file mode 100644 index 000000000000..4156932d87c7 --- /dev/null +++ b/external/jfreereport/version.mk @@ -0,0 +1,12 @@ +FLUTE_VERSION=1.1.6 +LIBBASE_VERSION=1.1.6 +LIBFONTS_VERSION=1.1.6 +LIBFORMAT_VERSION=1.1.6 +LIBFORMULA_VERSION=1.1.7 +LIBLAYOUT_VERSION=0.2.10 +LIBLOADER_VERSION=1.1.6 +LIBREPOSITORY_VERSION=1.1.6 +LIBSERIALIZER_VERSION=1.1.6 +LIBXML_VERSION=1.1.7 +FLOW_ENGINE_VERSION=0.9.4 + diff --git a/jfreereport/ExternalPackage_jfreereport_flow_engine.mk b/jfreereport/ExternalPackage_jfreereport_flow_engine.mk deleted file mode 100644 index 00e8ded5743d..000000000000 --- a/jfreereport/ExternalPackage_jfreereport_flow_engine.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- 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_ExternalPackage_ExternalPackage,jfreereport_flow_engine,jfreereport_flow_engine)) - -$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_flow_engine,jfreereport_flow_engine)) - -$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_flow_engine,bin/flow-engine-$(FLOW_ENGINE_VERSION).jar,build/lib/flow-engine.jar)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalPackage_jfreereport_flute.mk b/jfreereport/ExternalPackage_jfreereport_flute.mk deleted file mode 100644 index 2892342d90c4..000000000000 --- a/jfreereport/ExternalPackage_jfreereport_flute.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- 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_ExternalPackage_ExternalPackage,jfreereport_flute,jfreereport_flute)) - -$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_flute,jfreereport_flute)) - -$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_flute,bin/flute-$(FLUTE_VERSION).jar,dist/flute-$(FLUTE_VERSION).jar)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalPackage_jfreereport_libbase.mk b/jfreereport/ExternalPackage_jfreereport_libbase.mk deleted file mode 100644 index ee42a44c8fec..000000000000 --- a/jfreereport/ExternalPackage_jfreereport_libbase.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- 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_ExternalPackage_ExternalPackage,jfreereport_libbase,jfreereport_libbase)) - -$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libbase,jfreereport_libbase)) - -$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libbase,bin/libbase-$(LIBBASE_VERSION).jar,dist/libbase-$(LIBBASE_VERSION).jar)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalPackage_jfreereport_libfonts.mk b/jfreereport/ExternalPackage_jfreereport_libfonts.mk deleted file mode 100644 index fd89ded99c2b..000000000000 --- a/jfreereport/ExternalPackage_jfreereport_libfonts.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- 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_ExternalPackage_ExternalPackage,jfreereport_libfonts,jfreereport_libfonts)) - -$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libfonts,jfreereport_libfonts)) - -$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libfonts,bin/libfonts-$(LIBFONTS_VERSION).jar,dist/libfonts-$(LIBFONTS_VERSION).jar)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalPackage_jfreereport_libformula.mk b/jfreereport/ExternalPackage_jfreereport_libformula.mk deleted file mode 100644 index 674d4b27397e..000000000000 --- a/jfreereport/ExternalPackage_jfreereport_libformula.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- 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_ExternalPackage_ExternalPackage,jfreereport_libformula,jfreereport_libformula)) - -$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libformula,jfreereport_libformula)) - -$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libformula,bin/libformula-$(LIBFORMULA_VERSION).jar,dist/libformula-$(LIBFORMULA_VERSION).jar)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalPackage_jfreereport_liblayout.mk b/jfreereport/ExternalPackage_jfreereport_liblayout.mk deleted file mode 100644 index 84f56369e8f2..000000000000 --- a/jfreereport/ExternalPackage_jfreereport_liblayout.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- 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_ExternalPackage_ExternalPackage,jfreereport_liblayout,jfreereport_liblayout)) - -$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_liblayout,jfreereport_liblayout)) - -$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_liblayout,bin/liblayout-$(LIBLAYOUT_VERSION).jar,build/lib/liblayout.jar)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalPackage_jfreereport_libloader.mk b/jfreereport/ExternalPackage_jfreereport_libloader.mk deleted file mode 100644 index 3a8c1fd170c2..000000000000 --- a/jfreereport/ExternalPackage_jfreereport_libloader.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- 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_ExternalPackage_ExternalPackage,jfreereport_libloader,jfreereport_libloader)) - -$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libloader,jfreereport_libloader)) - -$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libloader,bin/libloader-$(LIBLOADER_VERSION).jar,dist/libloader-$(LIBLOADER_VERSION).jar)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalPackage_jfreereport_librepository.mk b/jfreereport/ExternalPackage_jfreereport_librepository.mk deleted file mode 100644 index 4a671d512a5e..000000000000 --- a/jfreereport/ExternalPackage_jfreereport_librepository.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- 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_ExternalPackage_ExternalPackage,jfreereport_librepository,jfreereport_librepository)) - -$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_librepository,jfreereport_librepository)) - -$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_librepository,bin/librepository-$(LIBREPOSITORY_VERSION).jar,dist/librepository-$(LIBREPOSITORY_VERSION).jar)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalPackage_jfreereport_libserializer.mk b/jfreereport/ExternalPackage_jfreereport_libserializer.mk deleted file mode 100644 index 4202856041a3..000000000000 --- a/jfreereport/ExternalPackage_jfreereport_libserializer.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- 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_ExternalPackage_ExternalPackage,jfreereport_libserializer,jfreereport_libserializer)) - -$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libserializer,jfreereport_libserializer)) - -$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libserializer,bin/libserializer-$(LIBBASE_VERSION).jar,dist/libserializer-$(LIBBASE_VERSION).jar)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalPackage_jfreereport_libxml.mk b/jfreereport/ExternalPackage_jfreereport_libxml.mk deleted file mode 100644 index 1db31f44959e..000000000000 --- a/jfreereport/ExternalPackage_jfreereport_libxml.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- 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_ExternalPackage_ExternalPackage,jfreereport_libxml,jfreereport_libxml)) - -$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libxml,jfreereport_libxml)) - -$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libxml,bin/libxml-$(LIBXML_VERSION).jar,dist/libxml-$(LIBXML_VERSION).jar)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalPackage_jfreereport_sac.mk b/jfreereport/ExternalPackage_jfreereport_sac.mk deleted file mode 100644 index 1f8df20e4db6..000000000000 --- a/jfreereport/ExternalPackage_jfreereport_sac.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -*- 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/. -# - -$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_sac,jfreereport_sac)) - -$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_sac,jfreereport_sac)) - -$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_sac,bin/sac.jar,build/lib/sac.jar)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/jfreereport/ExternalProject_jfreereport_flow_engine.mk deleted file mode 100644 index 08b86134cedc..000000000000 --- a/jfreereport/ExternalProject_jfreereport_flow_engine.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -*- 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/. -# - -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flow_engine)) - -$(eval $(call gb_ExternalProject_use_packages,jfreereport_flow_engine,\ - jfreereport_liblayout \ -)) - -$(eval $(call gb_ExternalProject_register_targets,jfreereport_flow_engine,\ - build \ -)) - -$(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) : - $(call gb_ExternalProject_run,build,\ - $(ICECREAM_RUN) "$(ANT)" \ - -q \ - -f build.xml \ - -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ - $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) )\ - -Dlib=$(OUTDIR)/bin \ - $(if $(filter yes,$(JAVACISGCJ))\ - ,-Dbuild.compiler=gcj \ - ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ - -Dant.build.javac.target=$(JAVA_TARGET_VER) \ - ) \ - $(if $(debug),-Dbuild.debug="on") jar \ - ) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalProject_jfreereport_flute.mk b/jfreereport/ExternalProject_jfreereport_flute.mk deleted file mode 100644 index 90e59d650ea7..000000000000 --- a/jfreereport/ExternalProject_jfreereport_flute.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -*- 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_ExternalProject_ExternalProject,jfreereport_flute)) - -$(eval $(call gb_ExternalProject_register_targets,jfreereport_flute,\ - build \ -)) - -$(call gb_ExternalProject_get_state_target,jfreereport_flute,build) : - $(call gb_ExternalProject_run,build,\ - $(ICECREAM_RUN) "$(ANT)" \ - -q \ - -f build.xml \ - -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ - $(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="$(FLUTE_VERSION)" \ - $(if $(debug),-Dbuild.debug="on") jar \ - ) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalProject_jfreereport_libbase.mk b/jfreereport/ExternalProject_jfreereport_libbase.mk deleted file mode 100644 index 0f1c2acabbef..000000000000 --- a/jfreereport/ExternalProject_jfreereport_libbase.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -*- 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_ExternalProject_ExternalProject,jfreereport_libbase)) - -$(eval $(call gb_ExternalProject_register_targets,jfreereport_libbase,\ - build \ -)) - -$(call gb_ExternalProject_get_state_target,jfreereport_libbase,build) : - $(call gb_ExternalProject_run,build,\ - $(ICECREAM_RUN) "$(ANT)" \ - -q \ - -f build.xml \ - -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ - $(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="$(LIBBASE_VERSION)" \ - $(if $(debug),-Dbuild.debug="on") jar \ - ) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalProject_jfreereport_libfonts.mk b/jfreereport/ExternalProject_jfreereport_libfonts.mk deleted file mode 100644 index 0982ed766c66..000000000000 --- a/jfreereport/ExternalProject_jfreereport_libfonts.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -*- 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_ExternalProject_ExternalProject,jfreereport_libfonts)) - -$(eval $(call gb_ExternalProject_register_targets,jfreereport_libfonts,\ - build \ -)) - -$(call gb_ExternalProject_get_state_target,jfreereport_libfonts,build) : - $(call gb_ExternalProject_run,build,\ - $(ICECREAM_RUN) "$(ANT)" \ - -q \ - -f build.xml \ - -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ - $(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="$(LIBFONTS_VERSION)" \ - $(if $(debug),-Dbuild.debug="on") jar \ - ) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalProject_jfreereport_libformula.mk b/jfreereport/ExternalProject_jfreereport_libformula.mk deleted file mode 100644 index 9523a0f04177..000000000000 --- a/jfreereport/ExternalProject_jfreereport_libformula.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -*- 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_ExternalProject_ExternalProject,jfreereport_libformula)) - -$(eval $(call gb_ExternalProject_register_targets,jfreereport_libformula,\ - build \ -)) - -$(call gb_ExternalProject_get_state_target,jfreereport_libformula,build) : - $(call gb_ExternalProject_run,build,\ - $(ICECREAM_RUN) "$(ANT)" \ - -q \ - -f build.xml \ - -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ - $(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="$(LIBFORMULA_VERSION)" \ - $(if $(debug),-Dbuild.debug="on") jar \ - ) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalProject_jfreereport_liblayout.mk b/jfreereport/ExternalProject_jfreereport_liblayout.mk deleted file mode 100644 index cddbef1d32ed..000000000000 --- a/jfreereport/ExternalProject_jfreereport_liblayout.mk +++ /dev/null @@ -1,52 +0,0 @@ -# -*- 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/. -# - -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_liblayout)) - -ifneq ($(SYSTEM_APACHE_COMMONS),YES) -$(eval $(call gb_ExternalProject_use_packages,jfreereport_liblayout,\ - apache_commons_logging_inc \ -)) -endif - -$(eval $(call gb_ExternalProject_use_packages,jfreereport_liblayout,\ - jfreereport_sac \ - jfreereport_libbase \ - jfreereport_flute \ - jfreereport_libloader \ - jfreereport_libxml \ - jfreereport_libformula \ - jfreereport_libfonts \ - jfreereport_librepository \ - jfreereport_libserializer \ -)) - -$(eval $(call gb_ExternalProject_register_targets,jfreereport_liblayout,\ - build \ -)) - -$(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) : - $(call gb_ExternalProject_run,build,\ - $(ICECREAM_RUN) "$(ANT)" \ - -q \ - -f build.xml \ - -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ - $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) )\ - $(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" \ - -Dlib=$(OUTDIR)/bin \ - $(if $(debug),-Dbuild.debug="on") jar \ - ) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalProject_jfreereport_libloader.mk b/jfreereport/ExternalProject_jfreereport_libloader.mk deleted file mode 100644 index 6b3c01b0a24e..000000000000 --- a/jfreereport/ExternalProject_jfreereport_libloader.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -*- 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_ExternalProject_ExternalProject,jfreereport_libloader)) - -$(eval $(call gb_ExternalProject_register_targets,jfreereport_libloader,\ - build \ -)) - -$(call gb_ExternalProject_get_state_target,jfreereport_libloader,build) : - $(call gb_ExternalProject_run,build,\ - $(ICECREAM_RUN) "$(ANT)" \ - -q \ - -f build.xml \ - -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ - $(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 \ - ) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalProject_jfreereport_librepository.mk b/jfreereport/ExternalProject_jfreereport_librepository.mk deleted file mode 100644 index 4f1a50e56ad2..000000000000 --- a/jfreereport/ExternalProject_jfreereport_librepository.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -*- 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_ExternalProject_ExternalProject,jfreereport_librepository)) - -$(eval $(call gb_ExternalProject_register_targets,jfreereport_librepository,\ - build \ -)) - -$(call gb_ExternalProject_get_state_target,jfreereport_librepository,build) : - $(call gb_ExternalProject_run,build,\ - $(ICECREAM_RUN) "$(ANT)" \ - -q \ - -f build.xml \ - -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ - $(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="$(LIBREPOSITORY_VERSION)" \ - $(if $(debug),-Dbuild.debug="on") jar \ - ) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalProject_jfreereport_libserializer.mk b/jfreereport/ExternalProject_jfreereport_libserializer.mk deleted file mode 100644 index 6bc29f7359ac..000000000000 --- a/jfreereport/ExternalProject_jfreereport_libserializer.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -*- 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_ExternalProject_ExternalProject,jfreereport_libserializer)) - -$(eval $(call gb_ExternalProject_register_targets,jfreereport_libserializer,\ - build \ -)) - -$(call gb_ExternalProject_get_state_target,jfreereport_libserializer,build) : - $(call gb_ExternalProject_run,build,\ - $(ICECREAM_RUN) "$(ANT)" \ - -q \ - -f build.xml \ - -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)." \ - $(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="$(LIBSERIALIZER_VERSION)" \ - $(if $(debug),-Dbuild.debug="on") jar \ - ) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalProject_jfreereport_libxml.mk b/jfreereport/ExternalProject_jfreereport_libxml.mk deleted file mode 100644 index c7340d51a233..000000000000 --- a/jfreereport/ExternalProject_jfreereport_libxml.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -*- 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_ExternalProject_ExternalProject,jfreereport_libxml)) - -$(eval $(call gb_ExternalProject_register_targets,jfreereport_libxml,\ - build \ -)) - -$(call gb_ExternalProject_get_state_target,jfreereport_libxml,build) : - $(call gb_ExternalProject_run,build,\ - $(ICECREAM_RUN) "$(ANT)" \ - -q \ - -f build.xml \ - -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ - $(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="$(LIBXML_VERSION)" \ - $(if $(debug),-Dbuild.debug="on") jar \ - ) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalProject_jfreereport_sac.mk b/jfreereport/ExternalProject_jfreereport_sac.mk deleted file mode 100644 index 72783a175317..000000000000 --- a/jfreereport/ExternalProject_jfreereport_sac.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- 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/. -# - -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_sac)) - -$(eval $(call gb_ExternalProject_register_targets,jfreereport_sac,\ - build \ -)) - -$(call gb_ExternalProject_get_state_target,jfreereport_sac,build) : - $(call gb_ExternalProject_run,build,\ - $(ICECREAM_RUN) "$(ANT)" \ - -q \ - -f build.xml \ - -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ - $(if $(filter yes,$(JAVACISGCJ))\ - ,-Dbuild.compiler=gcj \ - ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ - -Dant.build.javac.target=$(JAVA_TARGET_VER) \ - ) \ - -Dantcontrib.available="true" \ - $(if $(debug),-Dbuild.debug="on") all \ - ) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/Makefile b/jfreereport/Makefile deleted file mode 100644 index ccb1c85a04da..000000000000 --- a/jfreereport/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- - -module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) - -include $(module_directory)/../solenv/gbuild/partial_build.mk - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/Module_jfreereport.mk b/jfreereport/Module_jfreereport.mk deleted file mode 100644 index f2a40f91c15a..000000000000 --- a/jfreereport/Module_jfreereport.mk +++ /dev/null @@ -1,52 +0,0 @@ -# -*- 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/. -# - -$(eval $(call gb_Module_Module,jfreereport)) - -ifneq ($(ENABLE_JAVA),) -ifneq ($(filter JFREEREPORT,$(BUILD_TYPE)),) -$(eval $(call gb_Module_add_targets,jfreereport,\ - ExternalPackage_jfreereport_flow_engine \ - ExternalPackage_jfreereport_flute \ - ExternalPackage_jfreereport_libbase \ - ExternalPackage_jfreereport_libfonts \ - ExternalPackage_jfreereport_libformula \ - ExternalPackage_jfreereport_liblayout \ - ExternalPackage_jfreereport_libloader \ - ExternalPackage_jfreereport_librepository \ - ExternalPackage_jfreereport_libserializer \ - ExternalPackage_jfreereport_libxml \ - ExternalPackage_jfreereport_sac \ - ExternalProject_jfreereport_flow_engine \ - ExternalProject_jfreereport_flute \ - ExternalProject_jfreereport_libbase \ - ExternalProject_jfreereport_libfonts \ - ExternalProject_jfreereport_libformula \ - ExternalProject_jfreereport_liblayout \ - ExternalProject_jfreereport_libloader \ - ExternalProject_jfreereport_librepository \ - ExternalProject_jfreereport_libserializer \ - ExternalProject_jfreereport_libxml \ - ExternalProject_jfreereport_sac \ - UnpackedTarball_jfreereport_flow_engine \ - UnpackedTarball_jfreereport_flute \ - UnpackedTarball_jfreereport_libbase \ - UnpackedTarball_jfreereport_libfonts \ - UnpackedTarball_jfreereport_libformula \ - UnpackedTarball_jfreereport_liblayout \ - UnpackedTarball_jfreereport_libloader \ - UnpackedTarball_jfreereport_librepository \ - UnpackedTarball_jfreereport_libserializer \ - UnpackedTarball_jfreereport_libxml \ - UnpackedTarball_jfreereport_sac \ -)) -endif -endif - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/README b/jfreereport/README deleted file mode 100644 index 228577060d83..000000000000 --- a/jfreereport/README +++ /dev/null @@ -1 +0,0 @@ -Java library providing basic functionality for the report builder, from [http://www.object-refinery.com/jfreereport/] diff --git a/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk b/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk deleted file mode 100644 index af4dcd6a25b6..000000000000 --- a/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -*- 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/. -# - -$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_flow_engine)) - -$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_flow_engine,$(JFREEREPORT_FLOW_ENGINE_TARBALL),0)) - -$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_flow_engine,\ - build.xml \ -)) - -$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_flow_engine,\ - jfreereport/patches/flow-engine.patch \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_flute.mk b/jfreereport/UnpackedTarball_jfreereport_flute.mk deleted file mode 100644 index 9a7ed95c242a..000000000000 --- a/jfreereport/UnpackedTarball_jfreereport_flute.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -*- 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/. -# - -$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_flute)) - -$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_flute,$(JFREEREPORT_FLUTE_TARBALL),0)) - -$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_flute,\ - common_build.xml \ -)) - -$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_flute,\ - jfreereport/patches/common_build.patch \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libbase.mk b/jfreereport/UnpackedTarball_jfreereport_libbase.mk deleted file mode 100644 index 63d2ce3d8525..000000000000 --- a/jfreereport/UnpackedTarball_jfreereport_libbase.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -*- 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_UnpackedTarball_UnpackedTarball,jfreereport_libbase)) - -$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libbase,$(JFREEREPORT_LIBBASE_TARBALL),0)) - -$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libbase,\ - common_build.xml \ -)) - -$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libbase,\ - jfreereport/patches/common_build.patch \ - jfreereport/patches/libbase-$(LIBBASE_VERSION)-deprecated.patch \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libfonts.mk b/jfreereport/UnpackedTarball_jfreereport_libfonts.mk deleted file mode 100644 index c471ee03d63d..000000000000 --- a/jfreereport/UnpackedTarball_jfreereport_libfonts.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -*- 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_UnpackedTarball_UnpackedTarball,jfreereport_libfonts)) - -$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libfonts,$(JFREEREPORT_LIBFONTS_TARBALL),0)) - -$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libfonts,\ - common_build.xml \ -)) - -$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libfonts,\ - jfreereport/patches/common_build.patch \ - jfreereport/patches/libfonts-$(LIBFONTS_VERSION)-deprecated.patch \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libformula.mk b/jfreereport/UnpackedTarball_jfreereport_libformula.mk deleted file mode 100644 index 8dabfffe854e..000000000000 --- a/jfreereport/UnpackedTarball_jfreereport_libformula.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -*- 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/. -# - -$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libformula)) - -$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libformula,$(JFREEREPORT_LIBFORMULA_TARBALL),0)) - -$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libformula,\ - common_build.xml \ -)) - -$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libformula,\ - jfreereport/patches/common_build.patch \ - jfreereport/patches/libformula-time-notz.patch \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_liblayout.mk b/jfreereport/UnpackedTarball_jfreereport_liblayout.mk deleted file mode 100644 index f91311fb5190..000000000000 --- a/jfreereport/UnpackedTarball_jfreereport_liblayout.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -*- 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/. -# - -$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_liblayout)) - -$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_liblayout,$(JFREEREPORT_LIBLAYOUT_TARBALL),0)) - -$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_liblayout,\ - build.xml \ -)) - -$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_liblayout,\ - jfreereport/patches/liblayout.patch \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libloader.mk b/jfreereport/UnpackedTarball_jfreereport_libloader.mk deleted file mode 100644 index b34d414cb22f..000000000000 --- a/jfreereport/UnpackedTarball_jfreereport_libloader.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -*- 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_UnpackedTarball_UnpackedTarball,jfreereport_libloader)) - -$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libloader,$(JFREEREPORT_LIBLOADER_TARBALL),0)) - -$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libloader,\ - common_build.xml \ -)) - -$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libloader,\ - jfreereport/patches/common_build.patch \ - jfreereport/patches/libloader-$(LIBLOADER_VERSION)-deprecated.patch \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_librepository.mk b/jfreereport/UnpackedTarball_jfreereport_librepository.mk deleted file mode 100644 index 4262ddc6563f..000000000000 --- a/jfreereport/UnpackedTarball_jfreereport_librepository.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -*- 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_UnpackedTarball_UnpackedTarball,jfreereport_librepository)) - -$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_librepository,$(JFREEREPORT_LIBREPOSITORY_TARBALL),0)) - -$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_librepository,\ - common_build.xml \ -)) - -$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_librepository,\ - jfreereport/patches/common_build.patch \ - jfreereport/patches/librepository-$(LIBREPOSITORY_VERSION)-deprecated.patch \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libserializer.mk b/jfreereport/UnpackedTarball_jfreereport_libserializer.mk deleted file mode 100644 index 6c3992d11ee9..000000000000 --- a/jfreereport/UnpackedTarball_jfreereport_libserializer.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -*- 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/. -# - -$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libserializer)) - -$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libserializer,$(JFREEREPORT_LIBSERIALIZER_TARBALL),0)) - -$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libserializer,\ - common_build.xml \ -)) - -$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libserializer,\ - jfreereport/patches/common_build.patch \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libxml.mk b/jfreereport/UnpackedTarball_jfreereport_libxml.mk deleted file mode 100644 index 820eaac2d493..000000000000 --- a/jfreereport/UnpackedTarball_jfreereport_libxml.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -*- 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/. -# - -$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libxml)) - -$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libxml,$(JFREEREPORT_LIBXML_TARBALL),0)) - -$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libxml,\ - common_build.xml \ -)) - -$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libxml,\ - jfreereport/patches/common_build.patch \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_sac.mk b/jfreereport/UnpackedTarball_jfreereport_sac.mk deleted file mode 100644 index 2dcfd6484278..000000000000 --- a/jfreereport/UnpackedTarball_jfreereport_sac.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -*- 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/. -# - -$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_sac)) - -$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_sac,$(JFREEREPORT_SAC_TARBALL))) - -$(eval $(call gb_UnpackedTarball_add_file,jfreereport_sac,build.xml,jfreereport/java/sac/build.xml)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/java/sac/build.xml b/jfreereport/java/sac/build.xml deleted file mode 100644 index 0e85dff04f3a..000000000000 --- a/jfreereport/java/sac/build.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jfreereport/nbprojects/flute/nbproject/project.xml b/jfreereport/nbprojects/flute/nbproject/project.xml deleted file mode 100644 index 4280b91022ab..000000000000 --- a/jfreereport/nbprojects/flute/nbproject/project.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - org.netbeans.modules.ant.freeform - - - - flute-13a - - ../../wntmsci10/misc/build/flute - ${project.dir}/ant/build.xml - - - - - ${project.dir} - - - - - - all - - - - javadoc - - - - - - ${ant.script} - - - - - - - - - - - diff --git a/jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml b/jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml deleted file mode 100644 index f7a14ae8712f..000000000000 --- a/jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - org.netbeans.modules.ant.freeform - - - - jcommon-serializer - - ../../wntmsci10/misc/build/jcommon-serializer - ${project.dir}/ant/build.xml - - - - - ${project.dir} - - - - - - all - - - - javadoc - - - - - - ${ant.script} - - - - - - - - - - - diff --git a/jfreereport/nbprojects/jfreereport/nbproject/project.xml b/jfreereport/nbprojects/jfreereport/nbproject/project.xml deleted file mode 100644 index 8f6074cfb8d8..000000000000 --- a/jfreereport/nbprojects/jfreereport/nbproject/project.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - org.netbeans.modules.ant.freeform - - - - jfreereport - - ../../wntmsci10/misc/build/jfreereport - ${project.dir}/ant/build.xml - - - - - ${project.dir} - - - - - - all - - - - javadoc - - - - - - ${ant.script} - - - - - - - - - - - diff --git a/jfreereport/nbprojects/libfonts/nbproject/project.xml b/jfreereport/nbprojects/libfonts/nbproject/project.xml deleted file mode 100644 index d84bfb7f832b..000000000000 --- a/jfreereport/nbprojects/libfonts/nbproject/project.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - org.netbeans.modules.ant.freeform - - - - libfonts - - ../../wntmsci10/misc/build/libfonts - ${project.dir}/ant/build.xml - - - - - ${project.dir} - - - - - - all - - - - javadoc - - - - - - ${ant.script} - - - - - - - - - - - diff --git a/jfreereport/nbprojects/libformula/nbproject/project.xml b/jfreereport/nbprojects/libformula/nbproject/project.xml deleted file mode 100644 index e056200ee16e..000000000000 --- a/jfreereport/nbprojects/libformula/nbproject/project.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - org.netbeans.modules.ant.freeform - - - - libformula - - ../../wntmsci10/misc/build/libformula - ${project.dir}/ant/build.xml - - - - - ${project.dir} - - - - - - all - - - - javadoc - - - - - - ${ant.script} - - - - - - - - - - - diff --git a/jfreereport/nbprojects/liblayout/nbproject/project.xml b/jfreereport/nbprojects/liblayout/nbproject/project.xml deleted file mode 100644 index 63ad9ef3f420..000000000000 --- a/jfreereport/nbprojects/liblayout/nbproject/project.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - org.netbeans.modules.ant.freeform - - - - liblayout - - ../../wntmsci10/misc/build/liblayout - ${project.dir}/ant/build.xml - - - - - ${project.dir} - - - - - - all - - - - javadoc - - - - - - ${ant.script} - - - - - - - - - - - diff --git a/jfreereport/nbprojects/libloader/nbproject/project.xml b/jfreereport/nbprojects/libloader/nbproject/project.xml deleted file mode 100644 index 6b06d5686759..000000000000 --- a/jfreereport/nbprojects/libloader/nbproject/project.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - org.netbeans.modules.ant.freeform - - - - libloader - - ../../wntmsci10/misc/build/libloader - ${project.dir}/ant/build.xml - - - - - ${project.dir} - - - - - - all - - - - javadoc - - - - - - ${ant.script} - - - - - - - - - - - diff --git a/jfreereport/nbprojects/librepository/nbproject/project.xml b/jfreereport/nbprojects/librepository/nbproject/project.xml deleted file mode 100644 index c1b92593de3f..000000000000 --- a/jfreereport/nbprojects/librepository/nbproject/project.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - org.netbeans.modules.ant.freeform - - - - librepository - - ../../wntmsci10/misc/build/librepository - ${project.dir}/ant/build.xml - - - - - ${project.dir} - - - - - - all - - - - javadoc - - - - - - ${ant.script} - - - - - - - - - - - diff --git a/jfreereport/nbprojects/libxml/nbproject/project.xml b/jfreereport/nbprojects/libxml/nbproject/project.xml deleted file mode 100644 index 6b966c904cd3..000000000000 --- a/jfreereport/nbprojects/libxml/nbproject/project.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - org.netbeans.modules.ant.freeform - - - - libxml - - ../../wntmsci10/misc/build/libxml - ${project.dir}/ant/build.xml - - - - - ${project.dir} - - - - - - all - - - - javadoc - - - - - - ${ant.script} - - - - - - - - - - - diff --git a/jfreereport/patches/common_build.patch b/jfreereport/patches/common_build.patch deleted file mode 100644 index 2bc54595cf17..000000000000 --- a/jfreereport/patches/common_build.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- misc/libloader-1.1.3/common_build.xml 2009-11-16 10:25:34.000000000 +0100 -+++ misc/build/libloader-1.1.3/common_build.xml 2009-12-04 10:22:24.277647200 +0100 -@@ -261,7 +261,7 @@ TYPICAL TARGET SEQUENCE - - - -- -+ - - - -@@ -270,7 +270,7 @@ TYPICAL TARGET SEQUENCE - - - -- -+ - - - -@@ -497,7 +497,7 @@ - Sets a property build.id to the either "development" or the svn revision - if in release mode - ====================================================================--> -- -+ - - - -@@ -1061,6 +1061,11 @@ - Performs the actual compile - ====================================================================--> - -+ -+ -+ -+ -+ - -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ - -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - - -- -+ -+ - - - diff --git a/jfreereport/patches/libbase-1.1.6-deprecated.patch b/jfreereport/patches/libbase-1.1.6-deprecated.patch deleted file mode 100644 index da28c30eb70e..000000000000 --- a/jfreereport/patches/libbase-1.1.6-deprecated.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/libbase-1.1.6/source/org/pentaho/reporting/libraries/base/boot/ModuleInitializeException.java 2010-04-27 15:58:44.000000000 +0200 -+++ misc/build/libbase-1.1.6/source/org/pentaho/reporting/libraries/base/boot/ModuleInitializeException.java 2011-06-13 01:28:14.000000000 +0200 -@@ -48,7 +48,7 @@ - */ - public ModuleInitializeException(final String s, final Exception e) - { -- super(s, e); -+ super(s, (Throwable) e); - } - - /** diff --git a/jfreereport/patches/libfonts-1.1.6-deprecated.patch b/jfreereport/patches/libfonts-1.1.6-deprecated.patch deleted file mode 100644 index eb2ab8c76c10..000000000000 --- a/jfreereport/patches/libfonts-1.1.6-deprecated.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/libfonts-1.1.6/source/org/pentaho/reporting/libraries/fonts/FontException.java 2010-04-27 16:09:00.000000000 +0200 -+++ misc/build/libfonts-1.1.6/source/org/pentaho/reporting/libraries/fonts/FontException.java 2011-06-13 02:04:51.000000000 +0200 -@@ -39,7 +39,7 @@ - */ - public FontException(final String message, final Exception ex) - { -- super(message, ex); -+ super(message, (Throwable) ex); - } - - /** diff --git a/jfreereport/patches/libformula-time-notz.patch b/jfreereport/patches/libformula-time-notz.patch deleted file mode 100644 index fec65b17e1a6..000000000000 --- a/jfreereport/patches/libformula-time-notz.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/DefaultLocalizationContext.java 2010-06-01 17:15:52.000000000 +0200 -+++ a/jfreereport_libformula.patched/source/org/pentaho/reporting/libraries/formula/DefaultLocalizationContext.java 2013-08-06 13:11:58.000000000 +0200 -@@ -162,11 +169,17 @@ - final Locale activeLocale = getLocale(); - datetimeFormats.add(DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL, activeLocale)); - dateFormats.add(DateFormat.getDateInstance(DateFormat.FULL, activeLocale)); -- timeFormats.add(DateFormat.getTimeInstance(DateFormat.FULL, activeLocale)); -+ // LEM: "FULL" does not really make sense for isolated times: -+ // in the absence of a date, it cannot know whether it is meant in the winter-timezone -+ // or in the summer (daylight saving time) timezone, and will always display the winter timezone. -+ // timeFormats.add(DateFormat.getTimeInstance(DateFormat.FULL, activeLocale)); - - datetimeFormats.add(DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG, activeLocale)); - dateFormats.add(DateFormat.getDateInstance(DateFormat.LONG, activeLocale)); -- timeFormats.add(DateFormat.getTimeInstance(DateFormat.LONG, activeLocale)); -+ // LEM: "LONG" does not really make sense for isolated times: -+ // in the absence of a date, it cannot know whether it is meant in the winter-timezone -+ // or in the summer (daylight saving time) timezone, and will always display the winter timezone. -+ // timeFormats.add(DateFormat.getTimeInstance(DateFormat.LONG, activeLocale)); - - datetimeFormats.add(DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM, activeLocale)); - dateFormats.add(DateFormat.getDateInstance(DateFormat.MEDIUM, activeLocale)); diff --git a/jfreereport/patches/liblayout.patch b/jfreereport/patches/liblayout.patch deleted file mode 100644 index 035d99bd3b96..000000000000 --- a/jfreereport/patches/liblayout.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- misc/liblayout-0.2.10/build.xml (Revision 6728) -+++ misc/build/liblayout-0.2.10/build.xml (Arbeitskopie) -@@ -24,7 +24,8 @@ - - - -- -+ -+ - - - diff --git a/jfreereport/patches/libloader-1.1.6-deprecated.patch b/jfreereport/patches/libloader-1.1.6-deprecated.patch deleted file mode 100644 index c098906fcf70..000000000000 --- a/jfreereport/patches/libloader-1.1.6-deprecated.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/libloader-1.1.6/source/org/pentaho/reporting/libraries/resourceloader/ResourceException.java 2010-04-27 16:07:00.000000000 +0200 -+++ misc/build/libloader-1.1.6/source/org/pentaho/reporting/libraries/resourceloader/ResourceException.java 2011-06-13 02:00:46.000000000 +0200 -@@ -42,7 +42,7 @@ - */ - public ResourceException(final String message, final Exception ex) - { -- super(message, ex); -+ super(message, (Throwable) ex); - } - - /** diff --git a/jfreereport/patches/librepository-1.1.6-deprecated.patch b/jfreereport/patches/librepository-1.1.6-deprecated.patch deleted file mode 100644 index a266efc4bb79..000000000000 --- a/jfreereport/patches/librepository-1.1.6-deprecated.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/librepository-1.1.6/source/org/pentaho/reporting/libraries/repository/ContentIOException.java 2010-04-27 16:04:50.000000000 +0200 -+++ misc/build/librepository-1.1.6/source/org/pentaho/reporting/libraries/repository/ContentIOException.java 2011-06-13 01:44:35.000000000 +0200 -@@ -43,7 +43,7 @@ - */ - public ContentIOException(final String message, final Exception ex) - { -- super(message, ex); -+ super(message, (Throwable) ex); - } - - /** diff --git a/jfreereport/patches/sac.patch b/jfreereport/patches/sac.patch deleted file mode 100644 index 77db8511acbe..000000000000 --- a/jfreereport/patches/sac.patch +++ /dev/null @@ -1,73 +0,0 @@ -*** misc/sac-1.3/build.xml Thu Oct 18 09:22:24 2007 ---- misc/build/sac-1.3/build.xml Thu Oct 18 08:53:59 2007 -*************** -*** 1 **** -! dummy ---- 1,66 ---- -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -! -\ No newline at end of file diff --git a/jfreereport/version.mk b/jfreereport/version.mk deleted file mode 100644 index 4156932d87c7..000000000000 --- a/jfreereport/version.mk +++ /dev/null @@ -1,12 +0,0 @@ -FLUTE_VERSION=1.1.6 -LIBBASE_VERSION=1.1.6 -LIBFONTS_VERSION=1.1.6 -LIBFORMAT_VERSION=1.1.6 -LIBFORMULA_VERSION=1.1.7 -LIBLAYOUT_VERSION=0.2.10 -LIBLOADER_VERSION=1.1.6 -LIBREPOSITORY_VERSION=1.1.6 -LIBSERIALIZER_VERSION=1.1.6 -LIBXML_VERSION=1.1.7 -FLOW_ENGINE_VERSION=0.9.4 - -- cgit