Repository.mk | 18 +++++++++
scp2/source/impress/file_impress.scp | 9 ----
scp2/source/impress/module_impress.scp | 1
scp2/source/impress/module_ogltrans.scp | 9 ----
scp2/source/ooo/file_extra_ooo.scp | 21 ----------
scp2/source/ooo/file_ooo.scp | 64 --------------------------------
scp2/source/ooo/module_ooo.scp | 6 ---
7 files changed, 19 insertions(+), 109 deletions(-)
New commits:
commit 4430ace32a8dfd534d5e1c64ec7855edad11e5c4
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Mon Nov 28 16:42:09 2016 +0100
tdf#90753: AutoInstall more packages
Change-Id: If8a52f652f7ab890826372b6d081ee19c69fb5ec
Reviewed-on: https://gerrit.libreoffice.org/31371
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/Repository.mk b/Repository.mk
index 898a112..6ed227c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -766,6 +766,10 @@ $(eval $(call gb_Helper_register_jars,NONE,\
))
endif
+$(eval $(call gb_Helper_register_packages_for_install,impress,\
+ sd_xml \
+))
+
$(eval $(call gb_Helper_register_packages_for_install,ure,\
instsetoo_native_setup_ure \
ure_install \
@@ -803,6 +807,10 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
$(if $(SYSTEM_LIBEXTTEXTCAT),,libexttextcat_fingerprint) \
officecfg_misc \
+ $(if $(filter $(OS),MACOSX), \
+ extensions_mdibundle \
+ extensions_OOoSpotlightImporter \
+ ) \
extras_autocorr \
extras_autotextuser \
extras_cfgsrvnolang \
@@ -833,7 +841,12 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
extras_tplwizreport \
extras_tplwizstyles \
framework_dtd \
+ $(if $(filter $(OS),MACOSX),infoplist) \
package_dtd \
+ sd_web \
+ sfx2_emojiconfig \
+ $(if $(USING_X11),vcl_fontunxppds) \
+ $(if $(filter $(OS),MACOSX),vcl_osxres) \
xmloff_dtd \
xmlscript_dtd \
xmlhelp_helpxsl \
@@ -844,15 +857,19 @@ $(eval $(call
gb_Helper_register_packages_for_install,ooo,\
$(if
$(ENABLE_SCRIPTING_JAVASCRIPT),scripting_ScriptsJavaScript) \
) \
$(if $(DISABLE_SCRIPTING),,scripting_scriptbindinglib) \
+ $(if $(filter $(OS),MACOSX),sysui_osxicons) \
+ wizards_basicshare \
wizards_basicsrvaccess2base \
wizards_basicsrvdepot \
wizards_basicsrveuro \
wizards_basicsrvgimmicks \
wizards_basicsrvimport \
wizards_basicsrvform \
+ wizards_basicsrvstandard \
wizards_basicsrvtemplate \
wizards_basicsrvtools \
wizards_basicsrvtutorials \
+ wizards_basicusr \
xmlsec \
chart2_opengl_shader \
vcl_opengl_shader \
@@ -873,6 +890,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
))
$(eval $(call gb_Helper_register_packages_for_install,ogltrans,\
+ sd_opengl \
slideshow_opengl_shader \
))
diff --git a/scp2/source/impress/file_impress.scp
b/scp2/source/impress/file_impress.scp
index 81ad53c..f689c62 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -32,12 +32,3 @@ File gid_File_Help_Simpress_Zip
EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(simpress);
End
#endif
-
-// configuration files for custom animation effects
-
-File gid_File_sd_xml
- TXT_FILE_BODY;
- Styles = (FILELIST, PACKED);
- Dir = FILELIST_DIR;
- Name = "sd_xml.filelist";
-End
diff --git a/scp2/source/impress/module_impress.scp
b/scp2/source/impress/module_impress.scp
index 9d32917..ca335d6 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -38,7 +38,6 @@ Module gid_Module_Prg_Impress_Bin
Files = (auto_impress_ALL,
gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,
gid_File_Share_Registry_Impress_Xcd,
- gid_File_sd_xml,
gid_File_Tmp_Userinstall_Impress_Inf);
End
diff --git a/scp2/source/impress/module_ogltrans.scp
b/scp2/source/impress/module_ogltrans.scp
index 14f586f..a549c34 100644
--- a/scp2/source/impress/module_ogltrans.scp
+++ b/scp2/source/impress/module_ogltrans.scp
@@ -23,18 +23,11 @@
Module gid_Module_Optional_OGLTrans
PackageInfo = "packinfo_office.txt";
ParentID = gid_Module_Optional;
- Files = ( auto_ogltrans_ALL,
gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml,
gid_File_Share_Registry_Ogltrans_Xcd );
+ Files = ( auto_ogltrans_ALL, gid_File_Share_Registry_Ogltrans_Xcd );
Default = YES;
Styles = (HIDDEN_ROOT);
End
-File gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml
- TXT_FILE_BODY;
- Styles = (FILELIST,PACKED);
- Dir = FILELIST_DIR;
- Name = "sd_opengl.filelist";
-End
-
File gid_File_Share_Registry_Ogltrans_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
diff --git a/scp2/source/ooo/file_extra_ooo.scp
b/scp2/source/ooo/file_extra_ooo.scp
index b1a66a9..0dc16b1 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -25,29 +25,8 @@ File gid_File_Extra_Autotextshare_Lang
EXTRA_ALL_LANG(autotextshare,filelist);
End
-File gid_File_sd_web
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST, PACKED);
- Name = "sd_web.filelist";
-End
-
-File gid_File_Extra_Emojiconfig
- Dir = FILELIST_DIR;
- USER_FILE_BODY;
- Styles = (FILELIST, WORKSTATION);
- Name = "sfx2_emojiconfig.filelist";
-End
-
#ifdef USING_X11
-File gid_File_Extra_Fontunxppds
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "vcl_fontunxppds.filelist";
-End
-
File gid_File_Extra_Fontunxpsprint
Dir = FILELIST_DIR;
TXT_FILE_BODY;
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 905883e..df88a71 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -27,27 +27,6 @@
#include "macros.inc"
-File gid_File_Basic_User
- Dir = FILELIST_DIR;
- USER_FILE_BODY;
- Styles = (FILELIST, WORKSTATION);
- Name = "wizards_basicusr.filelist";
-End
-
-File gid_File_Basic_Share
- Dir = FILELIST_DIR;
- USER_FILE_BODY;
- Styles = (FILELIST, WORKSTATION);
- Name = "wizards_basicshare.filelist";
-End
-
-File gid_File_Basic_User_Standard
- Dir = FILELIST_DIR;
- USER_FILE_BODY;
- Styles = (FILELIST, WORKSTATION);
- Name = "wizards_basicsrvstandard.filelist";
-End
-
#if defined UNX && !defined MACOSX
File gid_File_Script_Gengal
@@ -296,49 +275,6 @@ File gid_Starregistry_Services_Rdb
Styles = (PACKED);
End
-#ifdef MACOSX
-File gid_File_App_InfoPlist
- TXT_FILE_BODY;
- Dir = FILELIST_DIR;
- Name = "infoplist.filelist";
- Styles = (FILELIST);
-End
-#endif
-
-#ifdef MACOSX
-File gid_File_Icns_Bundle
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "sysui_osxicons.filelist";
-End
-#endif
-
-#ifdef MACOSX
-File gid_File_Res_Bundle
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "vcl_osxres.filelist";
-End
-#endif
-
-#ifdef MACOSX
-File gid_File_Spotlight_Bundle
- TXT_FILE_BODY;
- Dir = FILELIST_DIR;
- Name = "extensions_mdibundle.filelist";
- Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-
-File gid_File_Spotlight_Bundle_lib
- TXT_FILE_BODY;
- Dir = FILELIST_DIR;
- Name = "extensions_OOoSpotlightImporter.filelist";
- Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-#endif
-
File gid_File_Images
TXT_FILE_BODY;
Dir = FILELIST_DIR;
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 8b8ab62..4287904 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -44,10 +44,6 @@ Module gid_Module_Root
gid_File_Lib_Cli_Oootypes_Assembly,
gid_File_Lib_Policy_Cli_Oootypes_Assembly,
gid_File_Lib_Policy_Cli_Oootypes_Config,
- gid_File_Basic_User,
- gid_File_Basic_Share,
- gid_File_Basic_User_Standard,
- gid_File_Extra_Emojiconfig,
gid_File_Extra_Gallsound,
gid_File_Extra_Gallarrows,
gid_File_Extra_Gallcomputers,
@@ -61,7 +57,6 @@ Module gid_Module_Root
gid_File_Extra_Galltxtshapes,
gid_File_Extra_Gallsounds,
gid_File_Basic_Form,
- gid_File_sd_web,
gid_File_Share_Config_Sofficecfg_uiconfig_basicide,
gid_File_Share_Config_Sofficecfg_uiconfig_cui,
#ifdef DBCONNECTIVITY
@@ -106,7 +101,6 @@ Module gid_Module_Root
gid_File_Share_Registry_Main_Xcd,
gid_File_Share_Registry_Forcedefault_Xcd,
gid_File_Extra_Fontunxpsprint,
- gid_File_Extra_Fontunxppds,
gid_File_Extra_Fontunxafm);
Unixlinks = (gid_Unixlink_File_Lib_Curl,
gid_Unixlink_File_Lib_Raptor,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
