install images with filelists

Change-Id: I3946b44838c659cad12d288c8a1ed5137c3e554e

7 files changed, 12 insertions, 127 deletions

diff --git a/configure.ac b/configure.ac
index 22807cb08aae..53c5a06527c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11195,7 +11195,6 @@ if test "x$with_theme" != "xno"; then
             *) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
         esac
         WITH_THEMES="$WITH_THEMES $theme"
-        SCPDEFS="$SCPDEFS -DTHEME_`echo $theme|tr '[[:lower:]]' '[[:upper:]]'`"
     done
 fi
 AC_MSG_RESULT([$WITH_THEMES])
diff --git a/icon-themes/README b/icon-themes/README
index 7d40cf9b0798..00d9fbcbddc6 100644
--- a/icon-themes/README
+++ b/icon-themes/README
@@ -3,7 +3,7 @@ Icon repository for the applications
 All of the icons, separated by themes are included in this
 directory. These icons are built into .zip files, and re-ordered /
 packed for efficiency reasons based on our UI configuration by the
-packimages/ module.
+postprocess/CustomTarget_images.mk.
 
 An icon theme does not need to contain all images, since these can be
 layered one on top of another.
@@ -27,14 +27,10 @@ How to add a new image set:
   FIXME: It is important to use an underscore '_' to delimit more words.
          scp2 compilation crashes when using a dash '-'.
          It evidently splits the name into two strings.
+   ^ It's probably not true anymore with filelists.
 
 - Add its name (new_set) to WITH_THEMES variable in configure.ac
 
-- Add its gid to the Files section of gid_Module_Root_Brand in
-  scp2/source/ooo/module_hidden_ooo.scp and add a corresponding File entry
-  to scp2/source/ooo/file_ooo.scp (see for example
-  gid_Brand_File_ImagesCrystal_Zip)
-
 - Add a vcl constant for it in vcl/inc/vcl/settings.hxx, e.g.
   #define STYLE_SYMBOLS_NEW_SET ((ULONG)5)
 
diff --git a/postprocess/Module_postprocess.mk b/postprocess/Module_postprocess.mk
index 6a381918e2cd..4baeb6197559 100644
--- a/postprocess/Module_postprocess.mk
+++ b/postprocess/Module_postprocess.mk
@@ -28,7 +28,6 @@ endif
 
 ifneq ($(gb_RUNNABLE_INSTDIR),)
 $(eval $(call gb_Module_add_targets,postprocess,\
-	Package_images_install \
 	Package_registry_install \
 ))
 endif
diff --git a/postprocess/Package_images.mk b/postprocess/Package_images.mk
index 97d0f02b25c7..af98789b967e 100644
--- a/postprocess/Package_images.mk
+++ b/postprocess/Package_images.mk
@@ -1,6 +1,5 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-#
 # This file is part of the LibreOffice project.
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
@@ -10,10 +9,11 @@
 
 $(eval $(call gb_Package_Package,postprocess_images,$(call gb_CustomTarget_get_workdir,postprocess/images)))
 
-$(if $(filter default,$(WITH_THEMES)),\
-$(eval $(call gb_Package_add_file,postprocess_images,bin/images.zip,images.zip)))
+$(eval $(call gb_Package_set_outdir,postprocess_images,$(INSTDIR)))
 
-$(foreach theme,$(filter-out default,$(WITH_THEMES)),\
-$(eval $(call gb_Package_add_file,postprocess_images,bin/images_$(theme).zip,images_$(theme).zip)))
+$(eval $(call gb_Package_add_files,postprocess_images,$(LIBO_SHARE_FOLDER)/config,\
+	$(if $(filter default,$(WITH_THEMES)),images.zip) \
+	$(foreach theme,$(filter-out default,$(WITH_THEMES)),images_$(theme).zip) \
+))
 
 # vim: set noet sw=4 ts=4:
diff --git a/postprocess/Package_images_install.mk b/postprocess/Package_images_install.mk
deleted file mode 100644
index b7ad4e2aca6f..000000000000
--- a/postprocess/Package_images_install.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,postprocess_images_install,$(call gb_CustomTarget_get_workdir,postprocess/images)))
-
-$(eval $(call gb_Package_set_outdir,postprocess_images_install,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_files,postprocess_images_install,$(LIBO_SHARE_FOLDER)/config,\
-	$(if $(filter default,$(WITH_THEMES)),images.zip) \
-	$(foreach theme,$(filter-out default,$(WITH_THEMES)),images_$(theme).zip) \
-))
-
-# vim: set noet sw=4 ts=4:
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