diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-06-13 16:43:10 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-06-13 19:26:02 +0200 |
| commit | ea9f2c7ce7f14ac2b027f8425e7216aa1ae5b2a5 (patch) | |
| tree | 29815c164c18feb8521ad5580063e9a2ab1dc4eb /scp2 | |
| parent | 0b49cc5b03b39aa1dfddf924c6eaf8cb42e791a8 (diff) | |
scp2: move reportbuilder libraries to AutoInstall
Change-Id: I3369b4c5c412741e82279db95cb517a8ae69b25c
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/AutoInstall.mk | 2 | ||||
| -rw-r--r-- | scp2/source/base/file_base.scp | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/module_reportbuilder.scp | 3 |
3 files changed, 1 insertions, 8 deletions
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 417603961e24..744c6cfa75d3 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -23,7 +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,reportbuilder,LIBO_LIB_FILE,,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/source/base/file_base.scp b/scp2/source/base/file_base.scp index c11105662188..4aec6bb97c97 100644 --- a/scp2/source/base/file_base.scp +++ b/scp2/source/base/file_base.scp @@ -46,14 +46,10 @@ STD_RES_FILE( gid_File_Res_Cnr, cnr) STD_RES_FILE( gid_File_Res_Sdbcl, sdbcl) STD_RES_FILE( gid_File_Res_Sdberr, sdberr) -STD_LIB_FILE( gid_File_Lib_Rpt, rpt ) STD_RES_FILE( gid_File_Res_Rpt, rpt) -STD_LIB_FILE( gid_File_Lib_Rptui, rptui ) STD_RES_FILE( gid_File_Res_Rptui, rptui) -STD_LIB_FILE( gid_File_Lib_Rptxml, rptxml ) - #if defined WITH_HELP File gid_File_Help_Sdatabase_Zip Dir = FILELIST_DIR; diff --git a/scp2/source/ooo/module_reportbuilder.scp b/scp2/source/ooo/module_reportbuilder.scp index ff2502b1bb7a..2aa6a5ff5e25 100644 --- a/scp2/source/ooo/module_reportbuilder.scp +++ b/scp2/source/ooo/module_reportbuilder.scp @@ -20,9 +20,6 @@ Module gid_Module_Reportbuilder Default = YES; Dirs = (gid_Dir_Share_Reportbuilder); Files = (auto_reportbuilder_ALL, - gid_File_Lib_Rpt, - gid_File_Lib_Rptui, - gid_File_Lib_Rptxml, gid_File_Xcd_Reportbuilder, gid_Filelist_ReportbuilderTemplates); End |