fdo#70393: move jfreereport to a subdir of external

Change-Id: I92d5458b48cc7e1c4794407bf71c54f0f048f2d8 Reviewed-on: https://gerrit.libreoffice.org/6325Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>

fdo#70393: move jfreereport to a subdir of external
Change-Id: I92d5458b48cc7e1c4794407bf71c54f0f048f2d8 Reviewed-on: https://gerrit.libreoffice.org/6325Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
a4964c60 · Khaled Hosny · David Tardon · 0f8174da · a4964c60 · a4964c60
Kaydet (Commit) a4964c60 authored Eki 18, 2013 tarafından Khaled Hosny Kaydeden (comit) David Tardon Eki 19, 2013
58 changed files
--- 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 \

--- 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) \
 ))

--- a/jfreereport/ExternalPackage_jfreereport_flow_engine.mk
+++ b/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))


--- a/jfreereport/ExternalPackage_jfreereport_flute.mk
+++ b/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))


--- a/jfreereport/ExternalPackage_jfreereport_libbase.mk
+++ b/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))


--- a/jfreereport/ExternalPackage_jfreereport_libfonts.mk
+++ b/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))


--- a/jfreereport/ExternalPackage_jfreereport_libformula.mk
+++ b/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))


--- a/jfreereport/ExternalPackage_jfreereport_liblayout.mk
+++ b/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))


--- a/jfreereport/ExternalPackage_jfreereport_libloader.mk
+++ b/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))


--- a/jfreereport/ExternalPackage_jfreereport_librepository.mk
+++ b/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))


--- a/jfreereport/ExternalPackage_jfreereport_libserializer.mk
+++ b/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))


--- a/jfreereport/ExternalPackage_jfreereport_libxml.mk
+++ b/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))


--- a/jfreereport/ExternalPackage_jfreereport_sac.mk
+++ b/jfreereport/ExternalPackage_jfreereport_sac.mk
--- a/jfreereport/ExternalProject_jfreereport_flow_engine.mk
+++ b/jfreereport/ExternalProject_jfreereport_flow_engine.mk
--- a/jfreereport/ExternalProject_jfreereport_flute.mk
+++ b/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))


--- a/jfreereport/ExternalProject_jfreereport_libbase.mk
+++ b/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))


--- a/jfreereport/ExternalProject_jfreereport_libfonts.mk
+++ b/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))


--- a/jfreereport/ExternalProject_jfreereport_libformula.mk
+++ b/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))


--- a/jfreereport/ExternalProject_jfreereport_liblayout.mk
+++ b/jfreereport/ExternalProject_jfreereport_liblayout.mk
--- a/jfreereport/ExternalProject_jfreereport_libloader.mk
+++ b/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))


--- a/jfreereport/ExternalProject_jfreereport_librepository.mk
+++ b/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))


--- a/jfreereport/ExternalProject_jfreereport_libserializer.mk
+++ b/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))


--- a/jfreereport/ExternalProject_jfreereport_libxml.mk
+++ b/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))


--- a/jfreereport/ExternalProject_jfreereport_sac.mk
+++ b/jfreereport/ExternalProject_jfreereport_sac.mk
--- a/jfreereport/Makefile
+++ b/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:
--- a/jfreereport/Module_jfreereport.mk
+++ b/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:
--- a/jfreereport/README
+++ b/jfreereport/README
--- a/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk
+++ b/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:
--- a/jfreereport/UnpackedTarball_jfreereport_flute.mk
+++ b/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:
--- a/jfreereport/UnpackedTarball_jfreereport_libbase.mk
+++ b/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:
--- a/jfreereport/UnpackedTarball_jfreereport_libfonts.mk
+++ b/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:
--- a/jfreereport/UnpackedTarball_jfreereport_libformula.mk
+++ b/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:
--- a/jfreereport/UnpackedTarball_jfreereport_liblayout.mk
+++ b/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:
--- a/jfreereport/UnpackedTarball_jfreereport_libloader.mk
+++ b/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:
--- a/jfreereport/UnpackedTarball_jfreereport_librepository.mk
+++ b/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:
--- a/jfreereport/UnpackedTarball_jfreereport_libserializer.mk
+++ b/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:
--- a/jfreereport/UnpackedTarball_jfreereport_libxml.mk
+++ b/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:
--- a/jfreereport/UnpackedTarball_jfreereport_sac.mk
+++ b/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:
--- a/jfreereport/java/sac/build.xml
+++ b/jfreereport/java/sac/build.xml
--- a/jfreereport/nbprojects/flute/nbproject/project.xml
+++ b/jfreereport/nbprojects/flute/nbproject/project.xml
--- a/jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml
+++ b/jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml
--- a/jfreereport/nbprojects/jfreereport/nbproject/project.xml
+++ b/jfreereport/nbprojects/jfreereport/nbproject/project.xml
--- a/jfreereport/nbprojects/libfonts/nbproject/project.xml
+++ b/jfreereport/nbprojects/libfonts/nbproject/project.xml
--- a/jfreereport/nbprojects/libformula/nbproject/project.xml
+++ b/jfreereport/nbprojects/libformula/nbproject/project.xml
--- a/jfreereport/nbprojects/liblayout/nbproject/project.xml
+++ b/jfreereport/nbprojects/liblayout/nbproject/project.xml
--- a/jfreereport/nbprojects/libloader/nbproject/project.xml
+++ b/jfreereport/nbprojects/libloader/nbproject/project.xml
--- a/jfreereport/nbprojects/librepository/nbproject/project.xml
+++ b/jfreereport/nbprojects/librepository/nbproject/project.xml
--- a/jfreereport/nbprojects/libxml/nbproject/project.xml
+++ b/jfreereport/nbprojects/libxml/nbproject/project.xml
--- a/jfreereport/patches/common_build.patch
+++ b/jfreereport/patches/common_build.patch
--- a/jfreereport/patches/flow-engine.patch
+++ b/jfreereport/patches/flow-engine.patch
--- a/jfreereport/patches/libbase-1.1.6-deprecated.patch
+++ b/jfreereport/patches/libbase-1.1.6-deprecated.patch
--- a/jfreereport/patches/libfonts-1.1.6-deprecated.patch
+++ b/jfreereport/patches/libfonts-1.1.6-deprecated.patch
--- a/jfreereport/patches/libformula-time-notz.patch
+++ b/jfreereport/patches/libformula-time-notz.patch
--- a/jfreereport/patches/liblayout.patch
+++ b/jfreereport/patches/liblayout.patch
--- a/jfreereport/patches/libloader-1.1.6-deprecated.patch
+++ b/jfreereport/patches/libloader-1.1.6-deprecated.patch
--- a/jfreereport/patches/librepository-1.1.6-deprecated.patch
+++ b/jfreereport/patches/librepository-1.1.6-deprecated.patch
--- a/jfreereport/patches/sac.patch
+++ b/jfreereport/patches/sac.patch
--- a/jfreereport/version.mk
+++ b/jfreereport/version.mk