[Libreoffice-commits] core.git: Repository.mk scp2/source
Matúš Kukan
matus.kukan at gmail.com
Sat Nov 26 15:17:11 UTC 2016
Repository.mk | 27 +++++
scp2/source/ooo/file_extra_ooo.scp | 182 -------------------------------------
scp2/source/ooo/file_ooo.scp | 11 --
scp2/source/ooo/module_ooo.scp | 23 ----
4 files changed, 27 insertions(+), 216 deletions(-)
New commits:
commit 42b959ff7241f955bfa68ee484d81c2d90be5434
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri Nov 25 22:42:42 2016 +0100
tdf#90753: Move extras packages to AutoInstall
Change-Id: I3e1504bb8a68a6142ab4035b2cb81c03d9af9227
diff --git a/Repository.mk b/Repository.mk
index 60c9fa0..2015556 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -780,8 +780,35 @@ $(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_autocorr \
+ extras_autotextuser \
+ extras_cfgsrvnolang \
+ extras_cfgusr \
+ extras_database \
+ extras_databasebiblio \
+ extras_gallbullets \
+ extras_gallhtmlexpo \
+ extras_gallmytheme \
+ extras_gallroot \
+ extras_gallsystem \
+ extras_gallwwwback \
+ extras_gallwwwgraf \
extras_glade \
extras_labels \
+ $(if $(filter WNT,$(OS)),extras_newfiles) \
+ extras_palettes \
+ extras_tplofficorr \
+ extras_tploffimisc \
+ extras_tplpresnt \
+ extras_tpl_styles \
+ extras_tplpersonal \
+ extras_tplwizbitmap \
+ extras_tplwizdesktop \
+ extras_tplwizletter \
+ extras_tplwizfax \
+ extras_tplwizagenda \
+ extras_tplwizreport \
+ extras_tplwizstyles \
framework_dtd \
package_dtd \
xmloff_dtd \
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 59a408c..b1a66a9 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -18,13 +18,6 @@
#include "macros.inc"
-File gid_File_Extra_Autocorr
- Dir = FILELIST_DIR;
- USER_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_autocorr.filelist";
-End
-
File gid_File_Extra_Autotextshare_Lang
Dir = FILELIST_DIR;
USER_FILE_BODY;
@@ -32,27 +25,6 @@ File gid_File_Extra_Autotextshare_Lang
EXTRA_ALL_LANG(autotextshare,filelist);
End
-File gid_File_Extra_Autotextuser
- Dir = FILELIST_DIR;
- USER_FILE_BODY;
- Styles = (FILELIST, WORKSTATION, DOCLANG);
- Name = "extras_autotextuser.filelist";
-End
-
-File gid_File_Extra_Cfgusr
- Dir = FILELIST_DIR;
- USER_FILE_BODY;
- Styles = (FILELIST, WORKSTATION);
- Name = "extras_cfgusr.filelist";
-End
-
-File gid_File_Extra_Cfgsrv
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_cfgsrvnolang.filelist";
-End
-
File gid_File_sd_web
Dir = FILELIST_DIR;
TXT_FILE_BODY;
@@ -60,20 +32,6 @@ File gid_File_sd_web
Name = "sd_web.filelist";
End
-File gid_File_Extra_Database
- Dir = FILELIST_DIR;
- USER_FILE_BODY;
- Styles = (FILELIST, WORKSTATION);
- Name = "extras_database.filelist";
-End
-
-File gid_File_Extra_Databasebiblio
- Dir = FILELIST_DIR;
- USER_FILE_BODY;
- Styles = (FILELIST, WORKSTATION);
- Name = "extras_databasebiblio.filelist";
-End
-
File gid_File_Extra_Emojiconfig
Dir = FILELIST_DIR;
USER_FILE_BODY;
@@ -99,27 +57,6 @@ End
#endif
-File gid_File_Extra_Gallbullets
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_gallbullets.filelist";
-End
-
-File gid_File_Extra_Gallhtmlexpo
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_gallhtmlexpo.filelist";
-End
-
-File gid_File_Extra_Gallroot
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_gallroot.filelist";
-End
-
#if defined (WITH_GALLERY_BUILD)
GALLERY_FILELIST(arrows)
@@ -136,125 +73,6 @@ GALLERY_FILELIST(txtshapes)
#endif
-File gid_File_Extra_Gallmytheme
- Dir = FILELIST_DIR;
- USER_FILE_BODY;
- Styles = (FILELIST, WORKSTATION);
- Name = "extras_gallmytheme.filelist";
-End
-
-File gid_File_Extra_Gallsystem
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_gallsystem.filelist";
-End
-
-File gid_File_Extra_Gallwwwback
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_gallwwwback.filelist";
-End
-
-File gid_File_Extra_Gallwwwgraf
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_gallwwwgraf.filelist";
-End
-
-File gid_File_Extra_Palettes
- Dir = FILELIST_DIR;
- USER_FILE_BODY;
- Styles = (FILELIST, WORKSTATION);
- Name = "extras_palettes.filelist";
-End
-
-File gid_File_Extra_Tplofficorr
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_tplofficorr.filelist";
-End
-
-File gid_File_Extra_Tploffimisc
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_tploffimisc.filelist";
-End
-
-File gid_File_Extra_Tplpresnt
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_tplpresnt.filelist";
-End
-
-File gid_File_Extra_Tpl_styles
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_tpl_styles.filelist";
-End
-
-File gid_File_Extra_Tplpersonal
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_tplpersonal.filelist";
-End
-
-File gid_File_Extra_Tplwizbitmap
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_tplwizbitmap.filelist";
-End
-
-File gid_File_Extra_Tplwizdesktop
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_tplwizdesktop.filelist";
-End
-
-File gid_File_Extra_Tplwizletter
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_tplwizletter.filelist";
-End
-
-File gid_File_Extra_Tplwizfax
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_tplwizfax.filelist";
-End
-
-File gid_File_Extra_Tplwizagenda
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_tplwizagenda.filelist";
-End
-
-File gid_File_Extra_Tplwizreport
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name ="extras_tplwizreport.filelist";
-End
-
-File gid_File_Extra_Tplwizstyles
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_tplwizstyles.filelist";
-End
-
File gid_File_Extra_Wordbook
Dir = gid_Dir_Wordbook;
PACKED_TXT_FILE_BODY;
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index f0542fc..905883e 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -250,17 +250,6 @@ UI_FILELIST_ALL_LANG(uui, uui)
UI_FILELIST_ALL_LANG(vcl, vcl)
UI_FILELIST_ALL_LANG(xmlsec, xmlsec)
-#ifdef WNT
-
-File gid_File_extras_newfiles
- TXT_FILE_BODY;
- Styles = (FILELIST, PACKED, WORKSTATION, OVERWRITE);
- Dir = FILELIST_DIR;
- Name = "extras_newfiles.filelist";
-End
-
-#endif
-
#if defined UNX && ! defined MACOSX
File gid_File_Txt_Pagein_Calc
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 0d781e1..8b8ab62 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -30,7 +30,6 @@ Module gid_Module_Root
gid_File_Txt_Pagein_Draw,
gid_File_Txt_Pagein_Impress,
gid_File_Txt_Pagein_Writer,
- gid_File_extras_newfiles,
gid_File_Rdb_Offapi,
gid_Starregistry_Services_Rdb,
auto_ooo_ALL,
@@ -48,16 +47,8 @@ Module gid_Module_Root
gid_File_Basic_User,
gid_File_Basic_Share,
gid_File_Basic_User_Standard,
- gid_File_Extra_Autotextuser,
- gid_File_Extra_Cfgusr,
- gid_File_Extra_Palettes,
- gid_File_Extra_Database,
- gid_File_Extra_Databasebiblio,
gid_File_Extra_Emojiconfig,
gid_File_Extra_Gallsound,
- gid_File_Extra_Autocorr,
- gid_File_Extra_Autocorr_Lang,
- gid_File_Extra_Gallroot,
gid_File_Extra_Gallarrows,
gid_File_Extra_Gallcomputers,
gid_File_Extra_Galldiagrams,
@@ -68,22 +59,8 @@ Module gid_Module_Root
gid_File_Extra_Gallsymbols,
gid_File_Extra_Galltransport,
gid_File_Extra_Galltxtshapes,
- gid_File_Extra_Gallbullets,
- gid_File_Extra_Gallhtmlexpo,
- gid_File_Extra_Gallsystem,
gid_File_Extra_Gallsounds,
- gid_File_Extra_Gallwwwback,
- gid_File_Extra_Gallwwwgraf,
- gid_File_Extra_Tpllayoutimpr,
- gid_File_Extra_Tplofficorr,
- gid_File_Extra_Tploffimisc,
- gid_File_Extra_Tplpresnt,
- gid_File_Extra_Tpl_styles,
- gid_File_Extra_Tplpersonal,
- gid_File_Extra_Tplwizbitmap,
- gid_File_Extra_Tplwizletter,
gid_File_Basic_Form,
- gid_File_Extra_Cfgsrv,
gid_File_sd_web,
gid_File_Share_Config_Sofficecfg_uiconfig_basicide,
gid_File_Share_Config_Sofficecfg_uiconfig_cui,
More information about the Libreoffice-commits
mailing list