fdo#61950 move report builder from bundled extensions to plain code

For test sample report from fdo#61726 can be used.

Change-Id: Iacf8ddc4cf8ad0a408d72e18ecb7237476afeffe
Reviewed-on: https://gerrit.libreoffice.org/2718
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>

6 files changed, 106 insertions, 42 deletions

diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk
index 9ad40a329a44..225cf94ba325 100644
--- a/scp2/InstallModule_base.mk
+++ b/scp2/InstallModule_base.mk
@@ -27,9 +27,10 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/base))
 
-$(eval $(call gb_InstallModule_define_if_set,scp2/base,\
-	ENABLE_REPORTBUILDER \
-))
+# Not sure about that?
+#$(eval $(call gb_InstallModule_define_if_set,scp2/base,\
+#	ENABLE_REPORTBUILDER \
+#))
 
 $(eval $(call gb_InstallModule_add_templates,scp2/base,\
     scp2/source/templates/module_langpack_base \
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 0d3aa52ef054..25adf4b867a1 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -25,6 +25,12 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
+ifeq ($(ENABLE_REPORTBUILDER),TRUE)
+ifneq ($(SYSTEM_JFREEREPORT),YES)
+include $(SRCDIR)/jfreereport/version.mk
+endif
+endif
+
 $(eval $(call gb_InstallModule_InstallModule,scp2/ooo))
 
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,ooo))
@@ -51,6 +57,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	ENABLE_TDEAB \
 	ENABLE_TELEPATHY \
 	MERGELIBS \
+	SYSTEM_APACHE_COMMONS \
 	SYSTEM_BOOST \
 	SYSTEM_CAIRO \
 	SYSTEM_CLUCENE \
@@ -61,6 +68,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	SYSTEM_HUNSPELL \
 	SYSTEM_HYPH \
 	SYSTEM_ICU \
+	SYSTEM_JFREEREPORT \
 	SYSTEM_JPEG \
 	SYSTEM_LCMS2 \
 	SYSTEM_LIBEXTTEXTCAT \
@@ -178,6 +186,23 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
 ))
 endif
 
+ifneq ($(SYSTEM_JFREEREPORT),YES)
+
+$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
+	-DFLOW_ENGINE_VERSION=$(FLOW_ENGINE_VERSION) \
+	-DFLUTE_VERSION=$(FLUTE_VERSION) \
+	-DLIBBASE_VERSION=$(LIBBASE_VERSION) \
+	-DLIBFONTS_VERSION=$(LIBFONTS_VERSION) \
+	-DLIBFORMULA_VERSION=$(LIBFORMULA_VERSION) \
+	-DLIBLAYOUT_VERSION=$(LIBLAYOUT_VERSION) \
+	-DLIBLOADER_VERSION=$(LIBLOADER_VERSION) \
+	-DLIBREPOSITORY_VERSION=$(LIBREPOSITORY_VERSION) \
+	-DLIBSERIALIZER_VERSION=$(LIBSERIALIZER_VERSION) \
+	-DLIBXML_VERSION=$(LIBXML_VERSION) \
+))
+
+endif
+
 $(eval $(call gb_InstallModule_add_templates,scp2/ooo,\
     scp2/source/templates/module_helppack \
     scp2/source/templates/module_helppack_root \
@@ -223,4 +248,10 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
 ))
 endif
 
+ifeq ($(ENABLE_REPORTBUILDER),TRUE)
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
+    scp2/source/ooo/module_reportbuilder \
+))
+endif
+
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
index 0b7055231f5c..fab69aa948f4 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -44,17 +44,6 @@ End
 
 #endif
 
-/* ** Report Builder ** */
-
-#ifndef WITHOUT_EXTENSION_REPORTDESIGN
-
-Directory gid_Brand_Dir_Share_Extensions_Report_Builder
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "report-builder";
-End
-
-#endif
-
 /* ** MediaWiki Publisher** */
 
 #ifndef WITHOUT_EXTENSION_MEDIAWIKI
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index f68b539aed66..936f15a617bb 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -46,19 +46,6 @@ End
 
 #endif
 
-/* ** Report Builder ** */
-
-#ifndef WITHOUT_EXTENSION_REPORTDESIGN
-
-File gid_File_Oxt_Report_Builder
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Report_Builder;
-    Name = "report-builder.oxt";
-End
-
-#endif
-
 /* ** MediaWiki Publisher** */
 
 #ifndef WITHOUT_EXTENSION_MEDIAWIKI
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index 319b69b70278..61c371e17039 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -57,21 +57,6 @@ Module gid_Module_Optional_Extensions_MINIMIZER
 End
 #endif
 
-/* ** Report Builder ** */
-
-#ifndef WITHOUT_EXTENSION_REPORTDESIGN
-Module gid_Module_Optional_Extensions_REPORTDESIGN
-    PackageInfo = "packinfo_extensions.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN);
-    ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_Report_Builder );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-#endif
-
 /* ** MediaWiki Publisher** */
 
 #ifndef WITHOUT_EXTENSION_MEDIAWIKI
diff --git a/scp2/source/ooo/module_reportbuilder.scp b/scp2/source/ooo/module_reportbuilder.scp
new file mode 100644
index 000000000000..89c0639ac25d
--- /dev/null
+++ b/scp2/source/ooo/module_reportbuilder.scp
@@ -0,0 +1,71 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ */
+
+#include "macros.inc"
+
+Module gid_Module_Reportbuilder
+    MOD_NAME_DESC(MODULE_PRG_REPORTBUILDER);
+    ParentID = gid_Module_Root_Brand;
+    Styles = (HIDDEN_ROOT);
+    Dirs = (gid_Dir_Share_Reportbuilder);
+    Files = (
+#if !defined SYSTEM_APACHE_COMMONS
+        gid_File_Jar_CommonsLogging,
+#endif
+#if ! defined SYSTEM_JFREEREPORT
+        gid_File_Jar_FlowEngine,
+        gid_File_Jar_Flute,
+        gid_File_Jar_Libbase,
+        gid_File_Jar_Libfonts,
+        gid_File_Jar_Libformula,
+        gid_File_Jar_Liblayout,
+        gid_File_Jar_Libloader,
+        gid_File_Jar_Librepository,
+        gid_File_Jar_Libserializer,
+        gid_File_Jar_Libxml,
+        gid_File_Jar_Sac,
+#endif
+        gid_File_Jar_Reportbuilder,
+        gid_File_Xcd_Reportbuilder);
+End
+
+Directory gid_Dir_Share_Reportbuilder
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "reportbuilder";
+End
+
+STD_JAR_FILE( gid_File_Jar_Reportbuilder, reportbuilder )
+
+#if !defined SYSTEM_APACHE_COMMONS
+STD_JAR_FILE(gid_File_Jar_CommonsLogging, commons-logging-1.1.1)
+#endif
+
+/* Not sure, if can we use CONCAT3 in that context here? */
+#ifndef SYSTEM_JFREEREPORT
+    STD_JAR_FILE( gid_File_Jar_FlowEngine, CONCAT3(flow-engine,-,FLOW_ENGINE_VERSION) )
+    STD_JAR_FILE( gid_File_Jar_Flute, CONCAT3(flute,-,FLUTE_VERSION) )
+    STD_JAR_FILE( gid_File_Jar_Libbase, CONCAT3(libbase,-,LIBBASE_VERSION) )
+    STD_JAR_FILE( gid_File_Jar_Libfonts, CONCAT3(libfonts,-,LIBFONTS_VERSION) )
+    STD_JAR_FILE( gid_File_Jar_Libformula, CONCAT3(libformula,-,LIBFORMULA_VERSION) )
+    STD_JAR_FILE( gid_File_Jar_Liblayout, CONCAT3(liblayout,-,LIBLAYOUT_VERSION) )
+    STD_JAR_FILE( gid_File_Jar_Libloader, CONCAT3(libloader,-,LIBLOADER_VERSION) )
+    STD_JAR_FILE( gid_File_Jar_Librepository, CONCAT3(librepository,-,LIBREPOSITORY_VERSION) )
+    STD_JAR_FILE( gid_File_Jar_Libserializer, CONCAT3(libserializer,-,LIBSERIALIZER_VERSION) )
+    STD_JAR_FILE( gid_File_Jar_Libxml, CONCAT3(libxml,-,LIBXML_VERSION) )
+    STD_JAR_FILE( gid_File_Jar_Sac, sac )
+#endif
+
+File gid_File_Xcd_Reportbuilder
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "reportbuilder.xcd";
+    Styles = (PACKED);
+End
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */