scp2: move reportbuilder Jars to AutoInstall

Change-Id: Ie8e8e4e5278278eecc1a6e54dbb70389df3e7155

Repository.mk

@@ -660,6 +660,11 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,ooo, \
 	xmerge \
 ))
 
+$(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_rhino, \
+	reportbuilder \
+	reportbuilderwizard \
+))
+
 ifneq ($(ENABLE_SCRIPTING_BEANSHELL),)
 $(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_bsh, \
 	ScriptProviderForBeanShell \
@@ -683,8 +688,6 @@ $(eval $(call gb_Helper_register_jars,OOO, \
 	letter \
 	pexcel \
 	pocketword \
-	reportbuilder \
-	reportbuilderwizard \
 	web \
 ))
 

scp2/source/ooo/module_reportbuilder.scp

@@ -23,8 +23,6 @@ Module gid_Module_Reportbuilder
         gid_File_Lib_Rpt,
         gid_File_Lib_Rptui,
         gid_File_Lib_Rptxml,
-        gid_File_Jar_Reportbuilder,
-        gid_File_Jar_Reportbuilderwizard,
         gid_File_Xcd_Reportbuilder,
         gid_Filelist_ReportbuilderTemplates);
 End
@@ -34,9 +32,6 @@ Directory gid_Dir_Share_Reportbuilder
     DosName = "reportbuilder";
 End
 
-STD_JAR_FILE( gid_File_Jar_Reportbuilder, reportbuilder )
-STD_JAR_FILE( gid_File_Jar_Reportbuilderwizard, reportbuilderwizard )
-
 File gid_File_Xcd_Reportbuilder
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Share_Registry;