From dca003a486acb63ea7ba6aaba94f6c9d3715b004 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Mon, 17 Jun 2013 15:41:34 +0200 Subject: install images with filelists Change-Id: I3946b44838c659cad12d288c8a1ed5137c3e554e --- scp2/source/ooo/file_ooo.scp | 73 ++--------------------------------- scp2/source/ooo/module_hidden_ooo.scp | 27 +------------ 2 files changed, 5 insertions(+), 95 deletions(-) (limited to 'scp2') diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 4bb5ea489e90..17a5e322c0d4 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -775,77 +775,12 @@ File gid_File_Spotlight_Bundle_lib End #endif -#ifdef THEME_DEFAULT -File gid_File_Images_Zip +File gid_File_Images TXT_FILE_BODY; - Dir = gid_Brand_Dir_Share_Config; - Name = "images.zip"; - Styles = (PACKED); -End -#endif - -#ifdef THEME_CRYSTAL -File gid_File_ImagesCrystal_Zip - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Share_Config; - Name = "images_crystal.zip"; - Styles = (PACKED); -End -#endif - -#ifdef THEME_OXYGEN -File gid_File_ImagesOxygen_Zip - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Share_Config; - Name = "images_oxygen.zip"; - Styles = (PACKED); -End -#endif - -#ifdef THEME_HICONTRAST -File gid_File_ImagesHicontrast_Zip - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Share_Config; - Name = "images_hicontrast.zip"; - Styles = (PACKED); -End -#endif - -#ifdef THEME_TANGO -File gid_File_ImagesTango_Zip - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Share_Config; - Name = "images_tango.zip"; - Styles = (PACKED); -End -#endif - -#ifdef THEME_TANGO_TESTING -File gid_File_ImagesTangoTesting_Zip - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Share_Config; - Name = "images_tango_testing.zip"; - Styles = (PACKED); -End -#endif - -#ifdef THEME_SIFR -File gid_File_ImagesSifr_Zip - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Share_Config; - Name = "images_sifr.zip"; - Styles = (PACKED); -End -#endif - -#ifdef THEME_HUMAN -File gid_File_ImagesHuman_Zip - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Share_Config; - Name = "images_human.zip"; - Styles = (PACKED); + Dir = FILELIST_DIR; + Name = "postprocess_images.filelist"; + Styles = (FILELIST, PACKED); End -#endif File gid_File_Share_Registry_Lingucomponent_Xcd TXT_FILE_BODY; diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index ec422bac3038..9fc674ba0226 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -358,32 +358,7 @@ Module gid_Module_Root_Files_Images Sortkey = "2050"; Default = YES; Styles = (HIDDEN_ROOT); - Files = ( -#ifdef THEME_DEFAULT - gid_File_Images_Zip, -#endif -#ifdef THEME_CRYSTAL - gid_File_ImagesCrystal_Zip, -#endif -#ifdef THEME_OXYGEN - gid_File_ImagesOxygen_Zip, -#endif -#ifdef THEME_HICONTRAST - gid_File_ImagesHicontrast_Zip, -#endif -#ifdef THEME_HUMAN - gid_File_ImagesHuman_Zip, -#endif -#ifdef THEME_SIFR - gid_File_ImagesSifr_Zip -#endif -#ifdef THEME_TANGO - gid_File_ImagesTango_Zip -#endif -#ifdef THEME_TANGO_TESTING - gid_File_ImagesTangoTesting_Zip -#endif - ); + Files = (gid_File_Images); End #endif -- cgit