RepositoryModule_host.mk | 1 external/Module_external.mk | 1 external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk | 19 + external/jfreereport/ExternalPackage_jfreereport_flute.mk | 19 + external/jfreereport/ExternalPackage_jfreereport_libbase.mk | 19 + external/jfreereport/ExternalPackage_jfreereport_libfonts.mk | 19 + external/jfreereport/ExternalPackage_jfreereport_libformula.mk | 19 + external/jfreereport/ExternalPackage_jfreereport_liblayout.mk | 19 + external/jfreereport/ExternalPackage_jfreereport_libloader.mk | 19 + external/jfreereport/ExternalPackage_jfreereport_librepository.mk | 19 + external/jfreereport/ExternalPackage_jfreereport_libserializer.mk | 19 + external/jfreereport/ExternalPackage_jfreereport_libxml.mk | 19 + external/jfreereport/ExternalPackage_jfreereport_sac.mk | 16 + external/jfreereport/ExternalProject_jfreereport_flow_engine.mk | 36 +++ external/jfreereport/ExternalProject_jfreereport_flute.mk | 36 +++ external/jfreereport/ExternalProject_jfreereport_libbase.mk | 36 +++ external/jfreereport/ExternalProject_jfreereport_libfonts.mk | 36 +++ external/jfreereport/ExternalProject_jfreereport_libformula.mk | 36 +++ external/jfreereport/ExternalProject_jfreereport_liblayout.mk | 52 +++++ external/jfreereport/ExternalProject_jfreereport_libloader.mk | 36 +++ external/jfreereport/ExternalProject_jfreereport_librepository.mk | 36 +++ external/jfreereport/ExternalProject_jfreereport_libserializer.mk | 36 +++ external/jfreereport/ExternalProject_jfreereport_libxml.mk | 36 +++ external/jfreereport/ExternalProject_jfreereport_sac.mk | 31 +++ external/jfreereport/Makefile | 7 external/jfreereport/Module_jfreereport.mk | 48 ++++ external/jfreereport/README | 1 external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk | 22 ++ external/jfreereport/UnpackedTarball_jfreereport_flute.mk | 22 ++ external/jfreereport/UnpackedTarball_jfreereport_libbase.mk | 26 ++ external/jfreereport/UnpackedTarball_jfreereport_libfonts.mk | 26 ++ external/jfreereport/UnpackedTarball_jfreereport_libformula.mk | 23 ++ external/jfreereport/UnpackedTarball_jfreereport_liblayout.mk | 22 ++ external/jfreereport/UnpackedTarball_jfreereport_libloader.mk | 26 ++ external/jfreereport/UnpackedTarball_jfreereport_librepository.mk | 26 ++ external/jfreereport/UnpackedTarball_jfreereport_libserializer.mk | 22 ++ external/jfreereport/UnpackedTarball_jfreereport_libxml.mk | 22 ++ external/jfreereport/UnpackedTarball_jfreereport_sac.mk | 16 + external/jfreereport/java/sac/build.xml | 64 ++++++ external/jfreereport/nbprojects/flute/nbproject/project.xml | 42 ++++ external/jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml | 42 ++++ external/jfreereport/nbprojects/jfreereport/nbproject/project.xml | 42 ++++ external/jfreereport/nbprojects/libfonts/nbproject/project.xml | 42 ++++ external/jfreereport/nbprojects/libformula/nbproject/project.xml | 42 ++++ external/jfreereport/nbprojects/liblayout/nbproject/project.xml | 42 ++++ external/jfreereport/nbprojects/libloader/nbproject/project.xml | 42 ++++ external/jfreereport/nbprojects/librepository/nbproject/project.xml | 42 ++++ external/jfreereport/nbprojects/libxml/nbproject/project.xml | 42 ++++ external/jfreereport/patches/common_build.patch | 102 ++++++++++ external/jfreereport/patches/flow-engine.patch | 12 + external/jfreereport/patches/libbase-1.1.6-deprecated.patch | 11 + external/jfreereport/patches/libfonts-1.1.6-deprecated.patch | 11 + external/jfreereport/patches/libformula-time-notz.patch | 22 ++ external/jfreereport/patches/liblayout.patch | 12 + external/jfreereport/patches/libloader-1.1.6-deprecated.patch | 11 + external/jfreereport/patches/librepository-1.1.6-deprecated.patch | 11 + external/jfreereport/patches/sac.patch | 73 +++++++ external/jfreereport/version.mk | 12 + jfreereport/ExternalPackage_jfreereport_flow_engine.mk | 19 - jfreereport/ExternalPackage_jfreereport_flute.mk | 19 - jfreereport/ExternalPackage_jfreereport_libbase.mk | 19 - jfreereport/ExternalPackage_jfreereport_libfonts.mk | 19 - jfreereport/ExternalPackage_jfreereport_libformula.mk | 19 - jfreereport/ExternalPackage_jfreereport_liblayout.mk | 19 - jfreereport/ExternalPackage_jfreereport_libloader.mk | 19 - jfreereport/ExternalPackage_jfreereport_librepository.mk | 19 - jfreereport/ExternalPackage_jfreereport_libserializer.mk | 19 - jfreereport/ExternalPackage_jfreereport_libxml.mk | 19 - jfreereport/ExternalPackage_jfreereport_sac.mk | 16 - jfreereport/ExternalProject_jfreereport_flow_engine.mk | 36 --- jfreereport/ExternalProject_jfreereport_flute.mk | 36 --- jfreereport/ExternalProject_jfreereport_libbase.mk | 36 --- jfreereport/ExternalProject_jfreereport_libfonts.mk | 36 --- jfreereport/ExternalProject_jfreereport_libformula.mk | 36 --- jfreereport/ExternalProject_jfreereport_liblayout.mk | 52 ----- jfreereport/ExternalProject_jfreereport_libloader.mk | 36 --- jfreereport/ExternalProject_jfreereport_librepository.mk | 36 --- jfreereport/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 jfreereport/UnpackedTarball_jfreereport_flow_engine.mk | 22 -- jfreereport/UnpackedTarball_jfreereport_flute.mk | 22 -- jfreereport/UnpackedTarball_jfreereport_libbase.mk | 26 -- jfreereport/UnpackedTarball_jfreereport_libfonts.mk | 26 -- jfreereport/UnpackedTarball_jfreereport_libformula.mk | 23 -- jfreereport/UnpackedTarball_jfreereport_liblayout.mk | 22 -- jfreereport/UnpackedTarball_jfreereport_libloader.mk | 26 -- jfreereport/UnpackedTarball_jfreereport_librepository.mk | 26 -- jfreereport/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 ---- jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml | 42 ---- jfreereport/nbprojects/jfreereport/nbproject/project.xml | 42 ---- jfreereport/nbprojects/libfonts/nbproject/project.xml | 42 ---- jfreereport/nbprojects/libformula/nbproject/project.xml | 42 ---- jfreereport/nbprojects/liblayout/nbproject/project.xml | 42 ---- jfreereport/nbprojects/libloader/nbproject/project.xml | 42 ---- jfreereport/nbprojects/librepository/nbproject/project.xml | 42 ---- jfreereport/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 - jfreereport/patches/libfonts-1.1.6-deprecated.patch | 11 - jfreereport/patches/libformula-time-notz.patch | 22 -- jfreereport/patches/liblayout.patch | 12 - jfreereport/patches/libloader-1.1.6-deprecated.patch | 11 - jfreereport/patches/librepository-1.1.6-deprecated.patch | 11 - jfreereport/patches/sac.patch | 73 ------- jfreereport/version.mk | 12 - 114 files changed, 1642 insertions(+), 1646 deletions(-)
New commits: commit a4964c60117b031609072912c06720cca7bb4497 Author: Khaled Hosny <[email protected]> Date: Fri Oct 18 18:51:26 2013 +0200 fdo#70393: move jfreereport to a subdir of external Change-Id: I92d5458b48cc7e1c4794407bf71c54f0f048f2d8 Reviewed-on: https://gerrit.libreoffice.org/6325 Reviewed-by: David Tardon <[email protected]> Tested-by: David Tardon <[email protected]> diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index f4c3055..fe4fc94 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 26b93ad..6764ac41 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/jfreereport/ExternalPackage_jfreereport_flow_engine.mk b/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk similarity index 93% rename from jfreereport/ExternalPackage_jfreereport_flow_engine.mk rename to external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk index 00e8ded..1482967 100644 --- a/jfreereport/ExternalPackage_jfreereport_flow_engine.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_flow_engine,jfreereport_flow_engine)) diff --git a/jfreereport/ExternalPackage_jfreereport_flute.mk b/external/jfreereport/ExternalPackage_jfreereport_flute.mk similarity index 93% rename from jfreereport/ExternalPackage_jfreereport_flute.mk rename to external/jfreereport/ExternalPackage_jfreereport_flute.mk index 2892342..f0196a8 100644 --- a/jfreereport/ExternalPackage_jfreereport_flute.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_flute.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_flute,jfreereport_flute)) diff --git a/jfreereport/ExternalPackage_jfreereport_libbase.mk b/external/jfreereport/ExternalPackage_jfreereport_libbase.mk similarity index 93% rename from jfreereport/ExternalPackage_jfreereport_libbase.mk rename to external/jfreereport/ExternalPackage_jfreereport_libbase.mk index ee42a44..0f6ee51 100644 --- a/jfreereport/ExternalPackage_jfreereport_libbase.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libbase.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libbase,jfreereport_libbase)) diff --git a/jfreereport/ExternalPackage_jfreereport_libfonts.mk b/external/jfreereport/ExternalPackage_jfreereport_libfonts.mk similarity index 93% rename from jfreereport/ExternalPackage_jfreereport_libfonts.mk rename to external/jfreereport/ExternalPackage_jfreereport_libfonts.mk index fd89ded..c097e76 100644 --- a/jfreereport/ExternalPackage_jfreereport_libfonts.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libfonts.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libfonts,jfreereport_libfonts)) diff --git a/jfreereport/ExternalPackage_jfreereport_libformula.mk b/external/jfreereport/ExternalPackage_jfreereport_libformula.mk similarity index 93% rename from jfreereport/ExternalPackage_jfreereport_libformula.mk rename to external/jfreereport/ExternalPackage_jfreereport_libformula.mk index 674d4b2..4e4266c 100644 --- a/jfreereport/ExternalPackage_jfreereport_libformula.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libformula.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libformula,jfreereport_libformula)) diff --git a/jfreereport/ExternalPackage_jfreereport_liblayout.mk b/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk similarity index 93% rename from jfreereport/ExternalPackage_jfreereport_liblayout.mk rename to external/jfreereport/ExternalPackage_jfreereport_liblayout.mk index 84f5636..fc19dd1 100644 --- a/jfreereport/ExternalPackage_jfreereport_liblayout.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_liblayout,jfreereport_liblayout)) diff --git a/jfreereport/ExternalPackage_jfreereport_libloader.mk b/external/jfreereport/ExternalPackage_jfreereport_libloader.mk similarity index 93% rename from jfreereport/ExternalPackage_jfreereport_libloader.mk rename to external/jfreereport/ExternalPackage_jfreereport_libloader.mk index 3a8c1fd..01f1bcc 100644 --- a/jfreereport/ExternalPackage_jfreereport_libloader.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libloader.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libloader,jfreereport_libloader)) diff --git a/jfreereport/ExternalPackage_jfreereport_librepository.mk b/external/jfreereport/ExternalPackage_jfreereport_librepository.mk similarity index 93% rename from jfreereport/ExternalPackage_jfreereport_librepository.mk rename to external/jfreereport/ExternalPackage_jfreereport_librepository.mk index 4a671d5..4103811 100644 --- a/jfreereport/ExternalPackage_jfreereport_librepository.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_librepository.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_librepository,jfreereport_librepository)) diff --git a/jfreereport/ExternalPackage_jfreereport_libserializer.mk b/external/jfreereport/ExternalPackage_jfreereport_libserializer.mk similarity index 93% rename from jfreereport/ExternalPackage_jfreereport_libserializer.mk rename to external/jfreereport/ExternalPackage_jfreereport_libserializer.mk index 4202856..f576ed7 100644 --- a/jfreereport/ExternalPackage_jfreereport_libserializer.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libserializer.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libserializer,jfreereport_libserializer)) diff --git a/jfreereport/ExternalPackage_jfreereport_libxml.mk b/external/jfreereport/ExternalPackage_jfreereport_libxml.mk similarity index 93% rename from jfreereport/ExternalPackage_jfreereport_libxml.mk rename to external/jfreereport/ExternalPackage_jfreereport_libxml.mk index 1db31f4..6425911 100644 --- a/jfreereport/ExternalPackage_jfreereport_libxml.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libxml.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libxml,jfreereport_libxml)) diff --git a/jfreereport/ExternalPackage_jfreereport_sac.mk b/external/jfreereport/ExternalPackage_jfreereport_sac.mk similarity index 100% rename from jfreereport/ExternalPackage_jfreereport_sac.mk rename to external/jfreereport/ExternalPackage_jfreereport_sac.mk diff --git a/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk similarity index 100% rename from jfreereport/ExternalProject_jfreereport_flow_engine.mk rename to external/jfreereport/ExternalProject_jfreereport_flow_engine.mk diff --git a/jfreereport/ExternalProject_jfreereport_flute.mk b/external/jfreereport/ExternalProject_jfreereport_flute.mk similarity index 95% rename from jfreereport/ExternalProject_jfreereport_flute.mk rename to external/jfreereport/ExternalProject_jfreereport_flute.mk index 90e59d6..f2a559c 100644 --- a/jfreereport/ExternalProject_jfreereport_flute.mk +++ b/external/jfreereport/ExternalProject_jfreereport_flute.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flute)) diff --git a/jfreereport/ExternalProject_jfreereport_libbase.mk b/external/jfreereport/ExternalProject_jfreereport_libbase.mk similarity index 95% rename from jfreereport/ExternalProject_jfreereport_libbase.mk rename to external/jfreereport/ExternalProject_jfreereport_libbase.mk index 0f1c2ac..8f1ec08 100644 --- a/jfreereport/ExternalProject_jfreereport_libbase.mk +++ b/external/jfreereport/ExternalProject_jfreereport_libbase.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libbase)) diff --git a/jfreereport/ExternalProject_jfreereport_libfonts.mk b/external/jfreereport/ExternalProject_jfreereport_libfonts.mk similarity index 95% rename from jfreereport/ExternalProject_jfreereport_libfonts.mk rename to external/jfreereport/ExternalProject_jfreereport_libfonts.mk index 0982ed7..ad38cd9 100644 --- a/jfreereport/ExternalProject_jfreereport_libfonts.mk +++ b/external/jfreereport/ExternalProject_jfreereport_libfonts.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libfonts)) diff --git a/jfreereport/ExternalProject_jfreereport_libformula.mk b/external/jfreereport/ExternalProject_jfreereport_libformula.mk similarity index 95% rename from jfreereport/ExternalProject_jfreereport_libformula.mk rename to external/jfreereport/ExternalProject_jfreereport_libformula.mk index 9523a0f..90d8b4d 100644 --- a/jfreereport/ExternalProject_jfreereport_libformula.mk +++ b/external/jfreereport/ExternalProject_jfreereport_libformula.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libformula)) diff --git a/jfreereport/ExternalProject_jfreereport_liblayout.mk b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk similarity index 100% rename from jfreereport/ExternalProject_jfreereport_liblayout.mk rename to external/jfreereport/ExternalProject_jfreereport_liblayout.mk diff --git a/jfreereport/ExternalProject_jfreereport_libloader.mk b/external/jfreereport/ExternalProject_jfreereport_libloader.mk similarity index 95% rename from jfreereport/ExternalProject_jfreereport_libloader.mk rename to external/jfreereport/ExternalProject_jfreereport_libloader.mk index 6b3c01b..2b860b8 100644 --- a/jfreereport/ExternalProject_jfreereport_libloader.mk +++ b/external/jfreereport/ExternalProject_jfreereport_libloader.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libloader)) diff --git a/jfreereport/ExternalProject_jfreereport_librepository.mk b/external/jfreereport/ExternalProject_jfreereport_librepository.mk similarity index 95% rename from jfreereport/ExternalProject_jfreereport_librepository.mk rename to external/jfreereport/ExternalProject_jfreereport_librepository.mk index 4f1a50e..21611e4 100644 --- a/jfreereport/ExternalProject_jfreereport_librepository.mk +++ b/external/jfreereport/ExternalProject_jfreereport_librepository.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalProject_ExternalProject,jfreereport_librepository)) diff --git a/jfreereport/ExternalProject_jfreereport_libserializer.mk b/external/jfreereport/ExternalProject_jfreereport_libserializer.mk similarity index 95% rename from jfreereport/ExternalProject_jfreereport_libserializer.mk rename to external/jfreereport/ExternalProject_jfreereport_libserializer.mk index 6bc29f7..2b0c951 100644 --- a/jfreereport/ExternalProject_jfreereport_libserializer.mk +++ b/external/jfreereport/ExternalProject_jfreereport_libserializer.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libserializer)) diff --git a/jfreereport/ExternalProject_jfreereport_libxml.mk b/external/jfreereport/ExternalProject_jfreereport_libxml.mk similarity index 95% rename from jfreereport/ExternalProject_jfreereport_libxml.mk rename to external/jfreereport/ExternalProject_jfreereport_libxml.mk index c7340d5..0cb2d7e 100644 --- a/jfreereport/ExternalProject_jfreereport_libxml.mk +++ b/external/jfreereport/ExternalProject_jfreereport_libxml.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libxml)) diff --git a/jfreereport/ExternalProject_jfreereport_sac.mk b/external/jfreereport/ExternalProject_jfreereport_sac.mk similarity index 100% rename from jfreereport/ExternalProject_jfreereport_sac.mk rename to external/jfreereport/ExternalProject_jfreereport_sac.mk diff --git a/jfreereport/Makefile b/external/jfreereport/Makefile similarity index 71% rename from jfreereport/Makefile rename to external/jfreereport/Makefile index ccb1c85..e4968cf 100644 --- a/jfreereport/Makefile +++ b/external/jfreereport/Makefile @@ -2,6 +2,6 @@ module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) -include $(module_directory)/../solenv/gbuild/partial_build.mk +include $(module_directory)/../../solenv/gbuild/partial_build.mk # vim: set noet sw=4 ts=4: diff --git a/jfreereport/Module_jfreereport.mk b/external/jfreereport/Module_jfreereport.mk similarity index 95% rename from jfreereport/Module_jfreereport.mk rename to external/jfreereport/Module_jfreereport.mk index f2a40f9..5a4431e 100644 --- a/jfreereport/Module_jfreereport.mk +++ b/external/jfreereport/Module_jfreereport.mk @@ -9,8 +9,6 @@ $(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 \ @@ -46,7 +44,5 @@ $(eval $(call gb_Module_add_targets,jfreereport,\ UnpackedTarball_jfreereport_libxml \ UnpackedTarball_jfreereport_sac \ )) -endif -endif # vim: set noet sw=4 ts=4: diff --git a/jfreereport/README b/external/jfreereport/README similarity index 100% rename from jfreereport/README rename to external/jfreereport/README diff --git a/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk b/external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk similarity index 93% rename from jfreereport/UnpackedTarball_jfreereport_flow_engine.mk rename to external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk index af4dcd6..f6640e4 100644 --- a/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk @@ -16,7 +16,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_flow_engine,\ )) $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_flow_engine,\ - jfreereport/patches/flow-engine.patch \ + external/jfreereport/patches/flow-engine.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_flute.mk b/external/jfreereport/UnpackedTarball_jfreereport_flute.mk similarity index 92% rename from jfreereport/UnpackedTarball_jfreereport_flute.mk rename to external/jfreereport/UnpackedTarball_jfreereport_flute.mk index 9a7ed95..a972e21 100644 --- a/jfreereport/UnpackedTarball_jfreereport_flute.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_flute.mk @@ -16,7 +16,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_flute,\ )) $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_flute,\ - jfreereport/patches/common_build.patch \ + external/jfreereport/patches/common_build.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libbase.mk b/external/jfreereport/UnpackedTarball_jfreereport_libbase.mk similarity index 79% rename from jfreereport/UnpackedTarball_jfreereport_libbase.mk rename to external/jfreereport/UnpackedTarball_jfreereport_libbase.mk index 63d2ce3..c3ba351 100644 --- a/jfreereport/UnpackedTarball_jfreereport_libbase.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_libbase.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libbase)) @@ -19,8 +19,8 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libbase,\ )) $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libbase,\ - jfreereport/patches/common_build.patch \ - jfreereport/patches/libbase-$(LIBBASE_VERSION)-deprecated.patch \ + external/jfreereport/patches/common_build.patch \ + external/jfreereport/patches/libbase-$(LIBBASE_VERSION)-deprecated.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libfonts.mk b/external/jfreereport/UnpackedTarball_jfreereport_libfonts.mk similarity index 79% rename from jfreereport/UnpackedTarball_jfreereport_libfonts.mk rename to external/jfreereport/UnpackedTarball_jfreereport_libfonts.mk index c471ee0..b648c58 100644 --- a/jfreereport/UnpackedTarball_jfreereport_libfonts.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_libfonts.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libfonts)) @@ -19,8 +19,8 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libfonts,\ )) $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libfonts,\ - jfreereport/patches/common_build.patch \ - jfreereport/patches/libfonts-$(LIBFONTS_VERSION)-deprecated.patch \ + external/jfreereport/patches/common_build.patch \ + external/jfreereport/patches/libfonts-$(LIBFONTS_VERSION)-deprecated.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libformula.mk b/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk similarity index 86% rename from jfreereport/UnpackedTarball_jfreereport_libformula.mk rename to external/jfreereport/UnpackedTarball_jfreereport_libformula.mk index 8dabfff..2bc3229 100644 --- a/jfreereport/UnpackedTarball_jfreereport_libformula.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk @@ -16,8 +16,8 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libformula,\ )) $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libformula,\ - jfreereport/patches/common_build.patch \ - jfreereport/patches/libformula-time-notz.patch \ + external/jfreereport/patches/common_build.patch \ + external/jfreereport/patches/libformula-time-notz.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_liblayout.mk b/external/jfreereport/UnpackedTarball_jfreereport_liblayout.mk similarity index 93% rename from jfreereport/UnpackedTarball_jfreereport_liblayout.mk rename to external/jfreereport/UnpackedTarball_jfreereport_liblayout.mk index f91311f..7281ba5 100644 --- a/jfreereport/UnpackedTarball_jfreereport_liblayout.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_liblayout.mk @@ -16,7 +16,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_liblayout,\ )) $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_liblayout,\ - jfreereport/patches/liblayout.patch \ + external/jfreereport/patches/liblayout.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libloader.mk b/external/jfreereport/UnpackedTarball_jfreereport_libloader.mk similarity index 79% rename from jfreereport/UnpackedTarball_jfreereport_libloader.mk rename to external/jfreereport/UnpackedTarball_jfreereport_libloader.mk index b34d414..7357ddd 100644 --- a/jfreereport/UnpackedTarball_jfreereport_libloader.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_libloader.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libloader)) @@ -19,8 +19,8 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libloader,\ )) $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libloader,\ - jfreereport/patches/common_build.patch \ - jfreereport/patches/libloader-$(LIBLOADER_VERSION)-deprecated.patch \ + external/jfreereport/patches/common_build.patch \ + external/jfreereport/patches/libloader-$(LIBLOADER_VERSION)-deprecated.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_librepository.mk b/external/jfreereport/UnpackedTarball_jfreereport_librepository.mk similarity index 79% rename from jfreereport/UnpackedTarball_jfreereport_librepository.mk rename to external/jfreereport/UnpackedTarball_jfreereport_librepository.mk index 4262ddc..86ff991 100644 --- a/jfreereport/UnpackedTarball_jfreereport_librepository.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_librepository.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_librepository)) @@ -19,8 +19,8 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_librepository,\ )) $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_librepository,\ - jfreereport/patches/common_build.patch \ - jfreereport/patches/librepository-$(LIBREPOSITORY_VERSION)-deprecated.patch \ + external/jfreereport/patches/common_build.patch \ + external/jfreereport/patches/librepository-$(LIBREPOSITORY_VERSION)-deprecated.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libserializer.mk b/external/jfreereport/UnpackedTarball_jfreereport_libserializer.mk similarity index 93% rename from jfreereport/UnpackedTarball_jfreereport_libserializer.mk rename to external/jfreereport/UnpackedTarball_jfreereport_libserializer.mk index 6c3992d..22d6d0c 100644 --- a/jfreereport/UnpackedTarball_jfreereport_libserializer.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_libserializer.mk @@ -16,7 +16,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libserializer,\ )) $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libserializer,\ - jfreereport/patches/common_build.patch \ + external/jfreereport/patches/common_build.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libxml.mk b/external/jfreereport/UnpackedTarball_jfreereport_libxml.mk similarity index 93% rename from jfreereport/UnpackedTarball_jfreereport_libxml.mk rename to external/jfreereport/UnpackedTarball_jfreereport_libxml.mk index 820eaac..ceca692 100644 --- a/jfreereport/UnpackedTarball_jfreereport_libxml.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_libxml.mk @@ -16,7 +16,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libxml,\ )) $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libxml,\ - jfreereport/patches/common_build.patch \ + external/jfreereport/patches/common_build.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_sac.mk b/external/jfreereport/UnpackedTarball_jfreereport_sac.mk similarity index 92% rename from jfreereport/UnpackedTarball_jfreereport_sac.mk rename to external/jfreereport/UnpackedTarball_jfreereport_sac.mk index 2dcfd64..eb95166 100644 --- a/jfreereport/UnpackedTarball_jfreereport_sac.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_sac.mk @@ -11,6 +11,6 @@ $(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)) +$(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/jfreereport/java/sac/build.xml b/external/jfreereport/java/sac/build.xml similarity index 100% rename from jfreereport/java/sac/build.xml rename to external/jfreereport/java/sac/build.xml diff --git a/jfreereport/nbprojects/flute/nbproject/project.xml b/external/jfreereport/nbprojects/flute/nbproject/project.xml similarity index 100% rename from jfreereport/nbprojects/flute/nbproject/project.xml rename to external/jfreereport/nbprojects/flute/nbproject/project.xml diff --git a/jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml b/external/jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml similarity index 100% rename from jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml rename to external/jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml diff --git a/jfreereport/nbprojects/jfreereport/nbproject/project.xml b/external/jfreereport/nbprojects/jfreereport/nbproject/project.xml similarity index 100% rename from jfreereport/nbprojects/jfreereport/nbproject/project.xml rename to external/jfreereport/nbprojects/jfreereport/nbproject/project.xml diff --git a/jfreereport/nbprojects/libfonts/nbproject/project.xml b/external/jfreereport/nbprojects/libfonts/nbproject/project.xml similarity index 100% rename from jfreereport/nbprojects/libfonts/nbproject/project.xml rename to external/jfreereport/nbprojects/libfonts/nbproject/project.xml diff --git a/jfreereport/nbprojects/libformula/nbproject/project.xml b/external/jfreereport/nbprojects/libformula/nbproject/project.xml similarity index 100% rename from jfreereport/nbprojects/libformula/nbproject/project.xml rename to external/jfreereport/nbprojects/libformula/nbproject/project.xml diff --git a/jfreereport/nbprojects/liblayout/nbproject/project.xml b/external/jfreereport/nbprojects/liblayout/nbproject/project.xml similarity index 100% rename from jfreereport/nbprojects/liblayout/nbproject/project.xml rename to external/jfreereport/nbprojects/liblayout/nbproject/project.xml diff --git a/jfreereport/nbprojects/libloader/nbproject/project.xml b/external/jfreereport/nbprojects/libloader/nbproject/project.xml similarity index 100% rename from jfreereport/nbprojects/libloader/nbproject/project.xml rename to external/jfreereport/nbprojects/libloader/nbproject/project.xml diff --git a/jfreereport/nbprojects/librepository/nbproject/project.xml b/external/jfreereport/nbprojects/librepository/nbproject/project.xml similarity index 100% rename from jfreereport/nbprojects/librepository/nbproject/project.xml rename to external/jfreereport/nbprojects/librepository/nbproject/project.xml diff --git a/jfreereport/nbprojects/libxml/nbproject/project.xml b/external/jfreereport/nbprojects/libxml/nbproject/project.xml similarity index 100% rename from jfreereport/nbprojects/libxml/nbproject/project.xml rename to external/jfreereport/nbprojects/libxml/nbproject/project.xml diff --git a/jfreereport/patches/common_build.patch b/external/jfreereport/patches/common_build.patch similarity index 100% rename from jfreereport/patches/common_build.patch rename to external/jfreereport/patches/common_build.patch diff --git a/jfreereport/patches/flow-engine.patch b/external/jfreereport/patches/flow-engine.patch similarity index 100% rename from jfreereport/patches/flow-engine.patch rename to external/jfreereport/patches/flow-engine.patch diff --git a/jfreereport/patches/libbase-1.1.6-deprecated.patch b/external/jfreereport/patches/libbase-1.1.6-deprecated.patch similarity index 100% rename from jfreereport/patches/libbase-1.1.6-deprecated.patch rename to external/jfreereport/patches/libbase-1.1.6-deprecated.patch diff --git a/jfreereport/patches/libfonts-1.1.6-deprecated.patch b/external/jfreereport/patches/libfonts-1.1.6-deprecated.patch similarity index 100% rename from jfreereport/patches/libfonts-1.1.6-deprecated.patch rename to external/jfreereport/patches/libfonts-1.1.6-deprecated.patch diff --git a/jfreereport/patches/libformula-time-notz.patch b/external/jfreereport/patches/libformula-time-notz.patch similarity index 100% rename from jfreereport/patches/libformula-time-notz.patch rename to external/jfreereport/patches/libformula-time-notz.patch diff --git a/jfreereport/patches/liblayout.patch b/external/jfreereport/patches/liblayout.patch similarity index 100% rename from jfreereport/patches/liblayout.patch rename to external/jfreereport/patches/liblayout.patch diff --git a/jfreereport/patches/libloader-1.1.6-deprecated.patch b/external/jfreereport/patches/libloader-1.1.6-deprecated.patch similarity index 100% rename from jfreereport/patches/libloader-1.1.6-deprecated.patch rename to external/jfreereport/patches/libloader-1.1.6-deprecated.patch diff --git a/jfreereport/patches/librepository-1.1.6-deprecated.patch b/external/jfreereport/patches/librepository-1.1.6-deprecated.patch similarity index 100% rename from jfreereport/patches/librepository-1.1.6-deprecated.patch rename to external/jfreereport/patches/librepository-1.1.6-deprecated.patch diff --git a/jfreereport/patches/sac.patch b/external/jfreereport/patches/sac.patch similarity index 100% rename from jfreereport/patches/sac.patch rename to external/jfreereport/patches/sac.patch diff --git a/jfreereport/version.mk b/external/jfreereport/version.mk similarity index 100% rename from jfreereport/version.mk rename to external/jfreereport/version.mk _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
