diff options
| author | David Tardon <dtardon@redhat.com> | 2013-05-04 08:03:56 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-04 16:44:47 +0200 |
| commit | 2dcf42b417c6246a5f6d14e8297510c751b1da96 (patch) | |
| tree | 304fcb190535be9a3685c1cf24053cffc009b2d9 /scp2 | |
| parent | 2f8d2c4ce4652e4e906eada7d248556db9bdc666 (diff) | |
install data files from extras using filelists
Change-Id: Ib092623501e36fa759a5215a435d21e1fea8dfdd
Diffstat (limited to 'scp2')
| -rwxr-xr-x | scp2/inc/macros.inc | 11 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 22 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 5 |
3 files changed, 13 insertions, 25 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 6ff795962975..405da24c6c2f 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -161,17 +161,6 @@ #define JARFILENAME(name) STRING(CONCAT2(name,.jar)) -#define PACKED_SHELLNEW_FILE_BODY \ - TXT_FILE_BODY; \ - Styles = (PACKED,WORKSTATION, OVERWRITE); \ - Dir = gid_Dir_Shellnew - -#define STD_SHELLNEW_FILE(id,name) \ - File id \ - PACKED_SHELLNEW_FILE_BODY; \ - Name = STRING(name) ; \ - End - #define SPECIAL_COMPONENT_LIB_FILE(id,name) \ File id \ Name = SPECIAL_COMPONENT_LIB_NAME(name); \ diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 759b677f10a9..6fedf2aa59db 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -506,16 +506,16 @@ End File gid_File_Share_Labels_Xml TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Brand_Dir_Share_Labels; - Name = "labels.xml"; + Styles = (FILELIST, PACKED); + Dir = FILELIST_DIR; + Name = "extras_labels.filelist"; End File gid_File_Share_Glade_Xml TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Brand_Dir_Share_Glade; - Name = "libreoffice-catalog.xml"; + Styles = (FILELIST, PACKED); + Dir = FILELIST_DIR; + Name = "extras_glade.filelist"; End File gid_File_Share_Registry_Main_Xcd @@ -710,10 +710,12 @@ UI_FILELIST_ALL_LANG(xmlsec, UIConfig/xmlsec, filelist) #ifdef WNT -STD_SHELLNEW_FILE(gid_File_Shellnew_Ods_Soffice, soffice.ods) -STD_SHELLNEW_FILE(gid_File_Shellnew_Odg_Soffice, soffice.odg) -STD_SHELLNEW_FILE(gid_File_Shellnew_Odp_Soffice, soffice.odp) -STD_SHELLNEW_FILE(gid_File_Shellnew_Odt_Soffice, soffice.odt) +File gid_File_extras_newfiles + TXT_FILE_BODY; + Styles = (FILELIST, PACKED, WORKSTATION, OVERWRITE); + Dir = FILELIST_DIR; + Name = "extras_newfiles.filelist"; +End #endif diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 5a429f8b4aa7..47e61d830456 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -107,10 +107,7 @@ Module gid_Module_Root_Files_2 gid_File_Txt_Pagein_Draw, gid_File_Txt_Pagein_Impress, gid_File_Txt_Pagein_Writer, - gid_File_Shellnew_Ods_Soffice, - gid_File_Shellnew_Odg_Soffice, - gid_File_Shellnew_Odp_Soffice, - gid_File_Shellnew_Odt_Soffice); + gid_File_extras_newfiles); End Module gid_Module_Root_Files_3 |