install branding images using filelists

This also reinstates the use of brand_dev/intro.png for non-release
builds, lost with gbuildization of instsetoo_native (commit
1d84e9d1d363bd550129efcbeafe670c0a049dd0).

Change-Id: I43477505c5c9a3d6ec961d640608e6e91379868e

6 files changed, 51 insertions, 140 deletions

diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index faed6e301731..751fcf74f75a 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -19,10 +19,9 @@ $(eval $(call gb_Module_add_targets,desktop,\
     Library_offacc \
     Library_sofficeapp \
     $(if $(ENABLE_HEADLESS),,Library_spl) \
-    Package_intro \
+    Package_branding \
+    $(if $(CUSTOM_BRAND_DIR),Package_branding_custom) \
     UIConfig_deployment \
-    Zip_brand \
-    Zip_brand_dev \
 ))
 
 ifeq ($(OS),LINUX)
diff --git a/desktop/Package_branding.mk b/desktop/Package_branding.mk
new file mode 100644
index 000000000000..47186bc5b4c9
--- /dev/null
+++ b/desktop/Package_branding.mk
@@ -0,0 +1,27 @@
+# -*- 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,desktop_branding,$(SRCDIR)/icon-themes/galaxy))
+
+$(eval $(call gb_Package_set_outdir,desktop_branding,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,desktop_branding,program,\
+    $(foreach image,$(filter $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES)),\
+		$(if $(filter intro.png,$(image)),\
+			$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),brand,brand_dev)/$(image),\
+			brand/$(image) \
+		) \
+	) \
+))
+
+$(eval $(call gb_Package_add_files,desktop_branding,program/shell,\
+    $(addprefix brand/shell/,$(filter-out $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES))) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/desktop/Package_branding_custom.mk b/desktop/Package_branding_custom.mk
new file mode 100644
index 000000000000..c240ab7656c2
--- /dev/null
+++ b/desktop/Package_branding_custom.mk
@@ -0,0 +1,22 @@
+# -*- 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,desktop_branding_custom,$(CUSTOM_BRAND_DIR)))
+
+$(eval $(call gb_Package_set_outdir,desktop_branding_custom,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,desktop_branding_custom,program,\
+    $(filter $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \
+))
+
+$(eval $(call gb_Package_add_files,desktop_branding_custom,program/shell,\
+    $(filter-out $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/desktop/Package_intro.mk b/desktop/Package_intro.mk
deleted file mode 100644
index a7b3ce044db3..000000000000
--- a/desktop/Package_intro.mk
+++ /dev/null
@@ -1,17 +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/.
-#
-
-# The patsubst is used to remove the trailing '/' dir produces.
-# Otherwise the package tries to depend on zip target brand//intro,
-# which is unfortunately different from brand/intro...
-$(eval $(call gb_Package_Package,desktop_intro,$(patsubst %/,%,$(dir $(call gb_Zip_get_target,brand/intro)))))
-
-$(eval $(call gb_Package_add_file,desktop_intro,pck/intro.zip,intro.zip))
-
-# vim: set ts=4 sw=4 et:
diff --git a/desktop/Zip_brand.mk b/desktop/Zip_brand.mk
deleted file mode 100644
index ad36639ea1a7..000000000000
--- a/desktop/Zip_brand.mk
+++ /dev/null
@@ -1,60 +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_Zip_Zip,brand/intro,$(WORKDIR)/Zip/brand_intro))
-
-$(eval $(call gb_Zip_add_file,brand/intro,shell/about.svg,\
-	$(if $(ABOUT_BACKGROUND_SVG),\
-	    $(ABOUT_BACKGROUND_SVG),\
-		$(SRCDIR)/icon-themes/galaxy/brand/shell/about.svg)\
-))
-
-$(eval $(call gb_Zip_add_file,brand/intro,flat_logo.svg,\
-	$(if $(FLAT_LOGO_SVG),\
-	    $(FLAT_LOGO_SVG),\
-		$(SRCDIR)/icon-themes/galaxy/brand/flat_logo.svg)\
-))
-
-$(eval $(call gb_Zip_add_file,brand/intro,intro.png,\
-	$(if $(INTRO_BITMAP),\
-	    $(INTRO_BITMAP),\
-		$(SRCDIR)/icon-themes/galaxy/brand/intro.png)\
-))
-
-$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_left.png,\
-	$(if $(STARTCENTER_LEFT_BITMAP),\
-	    $(STARTCENTER_LEFT_BITMAP),\
-		$(SRCDIR)/icon-themes/galaxy/brand/shell/backing_left.png)\
-))
-
-$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_right.png,\
-	$(if $(STARTCENTER_RIGHT_BITMAP),\
-	    $(STARTCENTER_RIGHT_BITMAP),\
-		$(SRCDIR)/icon-themes/galaxy/brand/shell/backing_right.png)\
-))
-
-$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_space.png,\
-	$(if $(STARTCENTER_SPACE_BITMAP),\
-	    $(STARTCENTER_SPACE_BITMAP),\
-		$(SRCDIR)/icon-themes/galaxy/brand/shell/backing_space.png)\
-))
-
-$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_rtl_left.png,\
-	$(if $(STARTCENTER_RTL_LEFT_BITMAP),\
-	    $(STARTCENTER_RTL_LEFT_BITMAP),\
-		$(SRCDIR)/icon-themes/galaxy/brand/shell/backing_rtl_left.png)\
-))
-
-$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_rtl_right.png,\
-	$(if $(STARTCENTER_RTL_RIGHT_BITMAP),\
-	    $(STARTCENTER_RTL_RIGHT_BITMAP),\
-		$(SRCDIR)/icon-themes/galaxy/brand/shell/backing_rtl_right.png)\
-))
-
-# vim: set ts=4 sw=4 et:
diff --git a/desktop/Zip_brand_dev.mk b/desktop/Zip_brand_dev.mk
deleted file mode 100644
index ef9f0207cdd0..000000000000
--- a/desktop/Zip_brand_dev.mk
+++ /dev/null
@@ -1,60 +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_Zip_Zip,brand_dev/intro,$(WORKDIR)/Zip/brand_intro_dev))
-
-$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/about.svg,\
-	$(if $(ABOUT_BACKGROUND_SVG),\
-	    $(ABOUT_BACKGROUND_SVG),\
-		$(SRCDIR)/icon-themes/galaxy/brand/shell/about.svg)\
-))
-
-$(eval $(call gb_Zip_add_file,brand_dev/intro,flat_logo.svg,\
-	$(if $(FLAT_LOGO_SVG),\
-	    $(FLAT_LOGO_SVG),\
-		$(SRCDIR)/icon-themes/galaxy/brand/flat_logo.svg)\
-))
-
-$(eval $(call gb_Zip_add_file,brand_dev/intro,intro.png,\
-	$(if $(INTRO_BITMAP),\
-	    $(INTRO_BITMAP),\
-		$(SRCDIR)/icon-themes/galaxy/brand_dev/intro.png)\
-))
-
-$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/backing_left.png,\
-	$(if $(STARTCENTER_LEFT_BITMAP),\
-	    $(STARTCENTER_LEFT_BITMAP),\
-		$(SRCDIR)/icon-themes/galaxy/brand/shell/backing_left.png)\
-))
-
-$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/backing_right.png,\
-	$(if $(STARTCENTER_RIGHT_BITMAP),\
-	    $(STARTCENTER_RIGHT_BITMAP),\
-		$(SRCDIR)/icon-themes/galaxy/brand/shell/backing_right.png)\
-))
-
-$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/backing_space.png,\
-	$(if $(STARTCENTER_SPACE_BITMAP),\
-	    $(STARTCENTER_SPACE_BITMAP),\
-		$(SRCDIR)/icon-themes/galaxy/brand/shell/backing_space.png)\
-))
-
-$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/backing_rtl_left.png,\
-	$(if $(STARTCENTER_RTL_LEFT_BITMAP),\
-	    $(STARTCENTER_RTL_LEFT_BITMAP),\
-		$(SRCDIR)/icon-themes/galaxy/brand/shell/backing_rtl_left.png)\
-))
-
-$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/backing_rtl_right.png,\
-	$(if $(STARTCENTER_RTL_RIGHT_BITMAP),\
-	    $(STARTCENTER_RTL_RIGHT_BITMAP),\
-		$(SRCDIR)/icon-themes/galaxy/brand/shell/backing_rtl_right.png)\
-))
-
-# vim: set ts=4 sw=4 et: