diff options
| -rw-r--r-- | RepositoryExternal.mk | 2 | ||||
| -rw-r--r-- | scp2/AutoInstall.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/module_reportbuilder.scp | 11 |
4 files changed, 6 insertions, 10 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 1854e40f2f69..e356b47baa4d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3165,7 +3165,7 @@ gb_ExternalProject__use_commons-logging := else # !SYSTEM_APACHE_COMMONS -$(eval $(call gb_Helper_register_jars,OOO,\ +$(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\ commons-logging-1.1.1 \ )) $(eval $(call gb_Helper_register_jars,OXT,\ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index e963336c5509..e66a705cc63b 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -23,6 +23,7 @@ $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCOND $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,python)) +$(eval $(call gb_AutoInstall_add_module,reportbuilder,,,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE)) diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 6a4eb7efa1e3..ea11a30916f9 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -18,6 +18,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/ooo)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\ ooo \ ooobinarytable \ + reportbuilder \ )) $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ @@ -29,7 +30,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ ENABLE_NPAPI_INTO_BROWSER \ ENABLE_ONLINE_UPDATE \ ENABLE_TDE \ - SYSTEM_APACHE_COMMONS \ SYSTEM_BOOST \ SYSTEM_CAIRO \ SYSTEM_CLUCENE \ diff --git a/scp2/source/ooo/module_reportbuilder.scp b/scp2/source/ooo/module_reportbuilder.scp index 9e0ba424e752..d57aff8a7120 100644 --- a/scp2/source/ooo/module_reportbuilder.scp +++ b/scp2/source/ooo/module_reportbuilder.scp @@ -9,6 +9,8 @@ #include "macros.inc" +#include "AutoInstall/reportbuilder" + Module gid_Module_Reportbuilder PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_REPORTDESIGN); @@ -17,10 +19,7 @@ Module gid_Module_Reportbuilder Minimal = NO; Default = YES; Dirs = (gid_Dir_Share_Reportbuilder); - Files = ( -#if !defined SYSTEM_APACHE_COMMONS - gid_File_Jar_CommonsLogging, -#endif + Files = (auto_reportbuilder_ALL, #if ! defined SYSTEM_JFREEREPORT gid_File_Jar_FlowEngine, gid_File_Jar_Flute, @@ -51,10 +50,6 @@ End STD_JAR_FILE( gid_File_Jar_Reportbuilder, reportbuilder ) STD_JAR_FILE( gid_File_Jar_Reportbuilderwizard, reportbuilderwizard ) -#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, flow-engine ) |