summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Repository.mk25
-rw-r--r--scp2/source/ooo/file_ooo.scp176
-rw-r--r--scp2/source/ooo/module_ooo.scp24
3 files changed, 26 insertions, 199 deletions
diff --git a/Repository.mk b/Repository.mk
index 10cfdcedb1c8..1dda9f4214c3 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -833,6 +833,31 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
))
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+ $(if $(SYSTEM_LIBEXTTEXTCAT),,libexttextcat_fingerprint) \
+ officecfg_misc \
+ extras_glade \
+ extras_labels \
+ framework_dtd \
+ package_dtd \
+ xmloff_dtd \
+ xmlscript_dtd \
+ xmlhelp_helpxsl \
+ $(if $(ENABLE_JAVA),\
+ scripting_java \
+ scripting_java_jars \
+ $(if $(ENABLE_SCRIPTING_BEANSHELL),scripting_ScriptsBeanShell) \
+ $(if $(ENABLE_SCRIPTING_JAVASCRIPT),scripting_ScriptsJavaScript) \
+ ) \
+ $(if $(DISABLE_SCRIPTING),,scripting_scriptbindinglib) \
+ wizards_basicsrvaccess2base \
+ wizards_basicsrvdepot \
+ wizards_basicsrveuro \
+ wizards_basicsrvgimmicks \
+ wizards_basicsrvimport \
+ wizards_basicsrvform \
+ wizards_basicsrvtemplate \
+ wizards_basicsrvtools \
+ wizards_basicsrvtutorials \
xmlsec \
chart2_opengl_shader \
vcl_opengl_shader \
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 5f31ae4f328d..5427fe77b384 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -27,73 +27,6 @@
#include "macros.inc"
-File gid_File_Basic_Access2Base
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "wizards_basicsrvaccess2base.filelist";
-End
-
-File gid_File_Basic_Depot
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "wizards_basicsrvdepot.filelist";
-End
-
-File gid_File_Basic_Euro
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "wizards_basicsrveuro.filelist";
-End
-
-File gid_File_Basic_Gimmicks
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "wizards_basicsrvgimmicks.filelist";
-End
-
-File gid_File_Basic_Importwiz
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "wizards_basicsrvimport.filelist";
-End
-
-File gid_File_Basic_Formwiz
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "wizards_basicsrvform.filelist";
-End
-
-#ifndef DISABLE_SCRIPTING
-
-File gid_File_Basic_Scriptbindinglib
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "scripting_scriptbindinglib.filelist";
-End
-
-#endif
-
-File gid_File_Basic_Template
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "wizards_basicsrvtemplate.filelist";
-End
-
-File gid_File_Basic_Tools
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "wizards_basicsrvtools.filelist";
-End
-
File gid_File_Basic_User
Dir = FILELIST_DIR;
USER_FILE_BODY;
@@ -115,13 +48,6 @@ File gid_File_Basic_User_Standard
Name = "wizards_basicsrvstandard.filelist";
End
-File gid_File_Basic_Tutorials
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "wizards_basicsrvtutorials.filelist";
-End
-
#if defined UNX
File gid_File_Script_Gengal
@@ -167,36 +93,8 @@ File gid_File_Bin_Senddoc
End
#endif
-File gid_File_framework_dtd
- TXT_FILE_BODY;
- Styles = (FILELIST, PACKED);
- Dir = FILELIST_DIR;
- Name = "framework_dtd.filelist";
-End
-
-File gid_File_xmlscript_dtd
- TXT_FILE_BODY;
- Styles = (FILELIST, PACKED);
- Dir = FILELIST_DIR;
- Name = "xmlscript_dtd.filelist";
-End
-
-File gid_File_Dtd_Manifest
- TXT_FILE_BODY;
- Styles = (FILELIST, PACKED);
- Dir = FILELIST_DIR;
- Name = "package_dtd.filelist";
-End
-
STD_RES_FILE( gid_File_Res_Eps, eps )
-File gid_File_Help_Help_Zip
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "xmlhelp_helpxsl.filelist";
-End
-
#if defined WITH_HELP
File gid_File_Help_Common_Zip
Dir = FILELIST_DIR;
@@ -265,41 +163,8 @@ End
#endif
#endif
-#ifndef SYSTEM_LIBEXTTEXTCAT
-// fingerprint files (lm)
-
-File gid_File_Share_Fingerprint
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "libexttextcat_fingerprint.filelist";
-End
-
-#endif
-
// mod files
-File gid_File_xmloff_dtd
- TXT_FILE_BODY;
- Styles = (FILELIST, PACKED);
- Dir = FILELIST_DIR;
- Name = "xmloff_dtd.filelist";
-End
-
-File gid_File_Share_Labels_Xml
- TXT_FILE_BODY;
- Styles = (FILELIST, PACKED);
- Dir = FILELIST_DIR;
- Name = "extras_labels.filelist";
-End
-
-File gid_File_Share_Glade_Xml
- TXT_FILE_BODY;
- Styles = (FILELIST, PACKED);
- Dir = FILELIST_DIR;
- Name = "extras_glade.filelist";
-End
-
File gid_File_Share_Registry_Main_Xcd
TXT_FILE_BODY;
Styles = (PACKED, SCPZIP_REPLACE);
@@ -318,13 +183,6 @@ End
#endif
-File gid_File_officecfg_misc
- TXT_FILE_BODY;
- Styles = (FILELIST, PACKED);
- Dir = FILELIST_DIR;
- Name = "officecfg_misc.filelist";
-End
-
File gid_File_Rdb_Offapi
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program_Types;
@@ -389,40 +247,6 @@ File gid_File_Share_Registry_Ctlseqcheck_Xcd
Name (th) = "ctlseqcheck.xcd";
End
-#ifdef ENABLE_JAVA
-File gid_File_Scripts_Java
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "scripting_java.filelist";
-End
-
-File gid_File_Scripts_Java_jars
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "scripting_java_jars.filelist";
-End
-
-#ifndef WITHOUT_SCRIPTING_BEANSHELL
-File gid_File_Scripts_Beanshell
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "scripting_ScriptsBeanShell.filelist";
-End
-#endif
-
-#ifndef WITHOUT_SCRIPTING_JAVASCRIPT
-File gid_File_Scripts_Javascript
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "scripting_ScriptsJavaScript.filelist";
-End
-#endif
-#endif
-
// user interface configuration files
UI_FILELIST(basicide, "UIConfig/modules/BasicIDE.filelist")
UI_FILELIST(cui, "UIConfig/cui.filelist")
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index a8d10c250da4..09dcd34c6d84 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -97,21 +97,7 @@ Module gid_Module_Root
gid_File_Extra_Tplpersonal,
gid_File_Extra_Tplwizbitmap,
gid_File_Extra_Tplwizletter,
- gid_File_Scripts_Beanshell,
- gid_File_Scripts_Java,
- gid_File_Scripts_Java_jars,
- gid_File_Scripts_Javascript,
- gid_File_Basic_Access2Base,
- gid_File_Basic_Depot,
- gid_File_Basic_Euro,
gid_File_Basic_Form,
- gid_File_Basic_Gimmicks,
- gid_File_Basic_Importwiz,
- gid_File_Basic_Formwiz,
- gid_File_Basic_Scriptbindinglib,
- gid_File_Basic_Template,
- gid_File_Basic_Tools,
- gid_File_Basic_Tutorials,
gid_File_Extra_Cfgsrv,
gid_File_sd_web,
gid_File_Share_Config_Sofficecfg_uiconfig_basicide,
@@ -154,20 +140,12 @@ Module gid_Module_Root
gid_File_Share_Config_Sofficecfg_uiconfig_uui,
gid_File_Share_Config_Sofficecfg_uiconfig_vcl,
gid_File_Share_Config_Sofficecfg_uiconfig_xmlsec,
- gid_File_framework_dtd,
- gid_File_xmlscript_dtd,
- gid_File_Dtd_Manifest,
- gid_File_xmloff_dtd,
- gid_File_officecfg_misc,
- gid_File_Share_Glade_Xml,
- gid_File_Share_Labels_Xml,
gid_File_Share_Registry_Main_Xcd,
gid_File_Share_Registry_Forcedefault_Xcd,
gid_File_Pymailmerge,
gid_File_Extra_Fontunxpsprint,
gid_File_Extra_Fontunxppds,
- gid_File_Extra_Fontunxafm,
- gid_File_Help_Help_Zip);
+ gid_File_Extra_Fontunxafm);
Unixlinks = (gid_Unixlink_File_Lib_Curl,
gid_Unixlink_File_Lib_Raptor,
gid_Unixlink_File_Lib_Rasqal,