scp2: move jfreereport to AutoInstall

Change-Id: I13bf9d1b75b3da1a8b6925f12eca938141fc9baf

RepositoryExternal.mk

@@ -3257,7 +3257,7 @@ endef
 
 else # !SYSTEM_JFREEREPORT
 
-$(eval $(call gb_Helper_register_jars,OOO,\
+$(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\
 	flow-engine \
 	flute-1.1.6 \
 	libbase-1.1.6 \

scp2/InstallModule_ooo.mk

@@ -7,12 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-ifeq ($(ENABLE_REPORTBUILDER),TRUE)
-ifeq ($(SYSTEM_JFREEREPORT),)
-include $(SRCDIR)/external/jfreereport/version.mk
-endif
-endif
-
 $(eval $(call gb_InstallModule_InstallModule,scp2/ooo))
 
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\
@@ -40,7 +34,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	SYSTEM_HUNSPELL \
 	SYSTEM_HYPH \
 	SYSTEM_ICU \
-	SYSTEM_JFREEREPORT \
 	SYSTEM_JPEG \
 	SYSTEM_LCMS2 \
 	SYSTEM_LIBEXTTEXTCAT \
@@ -105,21 +98,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
 	-DICU_MAJOR=$(ICU_MAJOR) \
 ))
 
-ifeq ($(SYSTEM_JFREEREPORT),)
-
-$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-	-DFLUTE_VERSION=$(FLUTE_VERSION) \
-	-DLIBBASE_VERSION=$(LIBBASE_VERSION) \
-	-DLIBFONTS_VERSION=$(LIBFONTS_VERSION) \
-	-DLIBFORMULA_VERSION=$(LIBFORMULA_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 \

scp2/source/ooo/module_reportbuilder.scp

@@ -20,19 +20,6 @@ Module gid_Module_Reportbuilder
     Default = YES; 
     Dirs = (gid_Dir_Share_Reportbuilder);
     Files = (auto_reportbuilder_ALL,
-#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_Lib_Rpt,
         gid_File_Lib_Rptui,
         gid_File_Lib_Rptxml,
@@ -50,21 +37,6 @@ End
 STD_JAR_FILE( gid_File_Jar_Reportbuilder, reportbuilder )
 STD_JAR_FILE( gid_File_Jar_Reportbuilderwizard, reportbuilderwizard )
 
-/* Not sure, if can we use CONCAT3 in that context here? */
-#ifndef SYSTEM_JFREEREPORT
-    STD_JAR_FILE( gid_File_Jar_FlowEngine, flow-engine )
-    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, liblayout )
-    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;