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

10 files changed, 87 insertions, 178 deletions

diff --git a/config_host.mk.in b/config_host.mk.in
index 82dfd50792d3..8696a920fba9 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -12,7 +12,6 @@ gb_SPACE:=$(gb_SPACE) $(gb_SPACE)
 export SRC_ROOT=@SRC_ROOT@
 export BUILDDIR=@BUILDDIR@
 
-export ABOUT_BACKGROUND_SVG=@ABOUT_BACKGROUND_SVG@
 @x_AFLAGS@ export AFLAGS=@AFLAGS@
 export ALLOC=@ALLOC@
 export ALL_LANGS=@ALL_LANGS@
@@ -36,6 +35,7 @@ export BOOST_CXXFLAGS=@BOOST_CXXFLAGS@
 export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@
 export BOOST_LDFLAGS=@BOOST_LDFLAGS@
 export BOOST_SYSTEM_LIB=@BOOST_SYSTEM_LIB@
+export BRAND_INTRO_IMAGES=@BRAND_INTRO_IMAGES@
 export BSH_JAR=@BSH_JAR@
 export BUILD_PLATFORM=@build@
 export BUILD_POSTGRESQL_SDBC=@BUILD_POSTGRESQL_SDBC@
@@ -75,6 +75,8 @@ export CROSS_COMPILING=@CROSS_COMPILING@
 export CURL=@CURL@
 export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
 export CURL_LIBS=$(gb_SPACE)@CURL_LIBS@
+export CUSTOM_BRAND_DIR=@CUSTOM_BRAND_DIR@
+export CUSTOM_BRAND_IMAGES=@CUSTOM_BRAND_IMAGES@
 export CXX=@CXX@
 export CXX_FOR_BUILD=@CXX_FOR_BUILD@
 export CXX_X64_BINARY=@CXX_X64_BINARY@
@@ -85,6 +87,7 @@ export DBUSMENUGTK_CFLAGS=$(gb_SPACE)@DBUSMENUGTK_CFLAGS@
 export DBUSMENUGTK_LIBS=$(gb_SPACE)@DBUSMENUGTK_LIBS@
 export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@
 export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@
+export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@
 export DEFAULT_TO_ENGLISH_FOR_PACKING=yes
 export DEVINSTALLDIR=@DEVINSTALLDIR@
 export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@
@@ -168,7 +171,6 @@ export EPM_FLAGS=@EPM_FLAGS@
 export EXTERNAL_WARNINGS_NOT_ERRORS=@EXTERNAL_WARNINGS_NOT_ERRORS@
 export debug=@ENABLE_DEBUG@
 @x_Cygwin@ export FIND=@WIN_FIND@
-export FLAT_LOGO_SVG=@FLAT_LOGO_SVG@
 export FLEX=@FLEX@
 export FLUTE_JAR=@FLUTE_JAR@
 export FONTCONFIG_CFLAGS=$(gb_SPACE)@FONTCONFIG_CFLAGS@
@@ -257,7 +259,6 @@ export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@
 export INSTDIR=@INSTDIR@
 export INSTALLDIR=@INSTALLDIR@
 export INSTALLDIRNAME=@INSTALLDIRNAME@
-export INTRO_BITMAP=@INTRO_BITMAP@
 export JAVACISGCJ=@JAVACISGCJ@
 export JAVACISKAFFE=@JAVACISKAFFE@
 export JAVACOMPILER=@JAVACOMPILER@
@@ -456,11 +457,6 @@ export SOLAR_JAVA=@SOLAR_JAVA@
 export SPLIT_APP_MODULES=@SPLIT_APP_MODULES@
 export SPLIT_OPT_FEATURES=@SPLIT_OPT_FEATURES@
 export SRCDIR=@SRC_ROOT@
-export STARTCENTER_LEFT_BITMAP=@STARTCENTER_LEFT_BITMAP@
-export STARTCENTER_RIGHT_BITMAP=@STARTCENTER_RIGHT_BITMAP@
-export STARTCENTER_RTL_LEFT_BITMAP=@STARTCENTER_RTL_LEFT_BITMAP@
-export STARTCENTER_RTL_RIGHT_BITMAP=@STARTCENTER_RTL_RIGHT_BITMAP@
-export STARTCENTER_SPACE_BITMAP=@STARTCENTER_SPACE_BITMAP@
 export STRIP=@STRIP@
 export STRIP_COMPONENTS=@STRIP_COMPONENTS@
 export SUNTEMPLATES_DE_PACK=@SUNTEMPLATES_DE_PACK@
diff --git a/configure.ac b/configure.ac
index bc20decdb8c3..cd03950b5a66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11455,53 +11455,37 @@ dnl branding
 dnl ===================================================================
 AC_MSG_CHECKING([for alternative branding images directory])
 # initialize mapped arrays
-brand_vars="INTRO_BITMAP ABOUT_BACKGROUND_SVG FLAT_LOGO_SVG \
-    STARTCENTER_LEFT_BITMAP STARTCENTER_RIGHT_BITMAP \
-    STARTCENTER_RTL_LEFT_BITMAP STARTCENTER_RTL_RIGHT_BITMAP \
-    STARTCENTER_SPACE_BITMAP"
-brand_files="intro.png about.svg flat_logo.svg \
+BRAND_INTRO_IMAGES="flat_logo.svg intro.png"
+brand_files="$BRAND_INTRO_IMAGES about.svg \
     backing_left.png backing_right.png \
     backing_rtl_left.png backing_rtl_right.png \
     backing_space.png"
-brandmaxidx=0
-
-for i in $brand_vars
-do
-    declare $i=
-    let "brandmaxidx=$brandmaxidx + 1"
-done
 
 if test -z "$with_branding" -o "$with_branding" = "no"; then
     AC_MSG_RESULT([none])
+    DEFAULT_BRAND_IMAGES="$brand_files"
 else
     if ! test -d $with_branding ; then
         AC_MSG_ERROR([No directory $with_branding, falling back to default branding])
     else
         AC_MSG_RESULT([$with_branding])
-        idx=1
-        while test $idx -le $brandmaxidx
+        CUSTOM_BRAND_DIR="$with_branding"
+        for lfile in $brand_files
         do
-            lvar=$(echo $brand_vars | cut -f$idx -d" ")
-            lfile=$(echo $brand_files | cut -f$idx -d" ")
-
             if ! test -f $with_branding/$lfile ; then
                 AC_MSG_WARN([Branded file $lfile does not exist, using the default one])
+                DEFAULT_BRAND_IMAGES="$DEFAULT_BRAND_IMAGES $lfile"
             else
-                declare lvar="$with_branding/$lfile"
+                CUSTOM_BRAND_IMAGES="$CUSTOM_BRAND_IMAGES $lfile"
             fi
-            let "idx=$idx + 1"
         done
         check_for_progress="yes"
     fi
 fi
-AC_SUBST(INTRO_BITMAP)
-AC_SUBST(ABOUT_BACKGROUND_SVG)
-AC_SUBST(FLAT_LOGO_SVG)
-AC_SUBST(STARTCENTER_LEFT_BITMAP)
-AC_SUBST(STARTCENTER_RIGHT_BITMAP)
-AC_SUBST(STARTCENTER_RTL_LEFT_BITMAP)
-AC_SUBST(STARTCENTER_RTL_RIGHT_BITMAP)
-AC_SUBST(STARTCENTER_SPACE_BITMAP)
+AC_SUBST([BRAND_INTRO_IMAGES])
+AC_SUBST([CUSTOM_BRAND_DIR])
+AC_SUBST([CUSTOM_BRAND_IMAGES])
+AC_SUBST([DEFAULT_BRAND_IMAGES])
 
 
 AC_MSG_CHECKING([for 'intro' progress settings])
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:
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 0462379595c0..e37484d09d77 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -79,6 +79,7 @@ $(eval $(call gb_InstallModule_define_value_if_set,scp2/ooo,\
 ))
 
 $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
+	$(if $(CUSTOM_BRAND_DIR),-DCUSTOM_BRANDING) \
 	$(if $(WINDOWS_SDK_HOME),\
 		-DHAVE_WINDOWS_SDK \
 	) \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index c4fe20a12dcb..28c1dca8d4ad 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -60,6 +60,7 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Bin_Unopkg,
              gid_Brand_File_Bin_Libxml2,
              gid_Brand_File_Bmp_IntroAboutShell,
+             gid_Brand_File_Bmp_IntroAboutShell_custom,
              gid_Brand_File_Html_Thirdpartylicensereadme,
              gid_Brand_File_Lib_Dbghelp,
              gid_Brand_File_Lib_Mingw_GccS,
@@ -613,9 +614,25 @@ End
 
 File gid_Brand_File_Bmp_IntroAboutShell
     TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "intro.zip";
-    Styles = (ARCHIVE);
+    Dir = FILELIST_DIR;
+    Name = "desktop_branding.filelist";
+    Styles = (FILELIST);
+End
+
+#if defined CUSTOM_BRANDING
+File gid_Brand_File_Bmp_IntroAboutShell_custom
+    TXT_FILE_BODY;
+    Dir = FILELIST_DIR;
+    Name = "desktop_branding_custom.filelist";
+    Styles = (FILELIST);
+End
+#endif
+
+File gid_Brand_File_Images_Brand_Zip
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Config;
+    Name = "images_brand.zip";
+    Styles = (PACKED);
 End
 
 File gid_Brand_File_Txt_Package