Fix configurable branding.

Bin the submakefile, use direct Zip cp calls. This also fixes
the non-working deps towards default_images.

5 files changed, 82 insertions, 54 deletions

diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 559097e515f4..3d0045c1e821 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -47,11 +47,9 @@ $(eval $(call gb_Module_add_targets,desktop,\
     Library_offacc \
     Library_sofficeapp \
     Library_spl \
-    Package_branding \
     Package_intro \
     Zip_brand \
     Zip_brand_dev \
-    Zip_shell \
 ))
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
diff --git a/desktop/Package_branding.mk b/desktop/Package_branding.mk
deleted file mode 100644
index bd2f36f8183c..000000000000
--- a/desktop/Package_branding.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,desktop_branding,$(WORKDIR)/CustomTarget/desktop/branding))
-
-$(eval $(call gb_Package_add_customtarget,desktop_branding,desktop/branding))
-
-# vim: set ts=4 sw=4 et:
diff --git a/desktop/Zip_brand.mk b/desktop/Zip_brand.mk
index 03ba5ece57d9..05a272322a05 100644
--- a/desktop/Zip_brand.mk
+++ b/desktop/Zip_brand.mk
@@ -25,15 +25,48 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Zip_Zip,brand/intro,$(WORKDIR)/CustomTarget/desktop/branding))
+$(eval $(call gb_Zip_Zip,brand/intro,$(WORKDIR)/Zip/brand_intro))
 
-$(eval $(call gb_Zip_add_files,brand/intro,\
-    about.png \
-    intro.png \
+$(eval $(call gb_Zip_add_file,brand/intro,about.png,\
+	$(if $(ABOUT_BITMAP),\
+	    $(ABOUT_BITMAP),\
+		$(SRCDIR)/icon-themes/galaxy/brand/about.png)\
 ))
 
-$(eval $(call gb_Zip_add_dependencies,brand/intro,\
-    $(call gb_Package_get_target,desktop_branding) \
+$(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
index 72f2261fb10c..b554a69b5a89 100644
--- a/desktop/Zip_brand_dev.mk
+++ b/desktop/Zip_brand_dev.mk
@@ -25,11 +25,48 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Zip_Zip,brand_dev/intro,$(SRCDIR)/icon-themes/galaxy/brand_dev))
+$(eval $(call gb_Zip_Zip,brand_dev/intro,$(WORKDIR)/Zip/brand_intro_dev))
 
-$(eval $(call gb_Zip_add_files,brand_dev/intro,\
-    about.png \
-    intro.png \
+$(eval $(call gb_Zip_add_file,brand_dev/intro,about.png,\
+	$(if $(ABOUT_BITMAP),\
+	    $(ABOUT_BITMAP),\
+		$(SRCDIR)/icon-themes/galaxy/brand_dev/about.png)\
+))
+
+$(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/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index ed8f3b67cbbc..474d5379c6dc 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -63,8 +63,7 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Bin_Unopkgexe,
              gid_Brand_File_Bin_Unopkg,
              gid_Brand_File_Bin_Libxml2,
-             gid_Brand_File_Bmp_Shell,
-             gid_Brand_File_Bmp_IntroAbout,
+             gid_Brand_File_Bmp_IntroAboutShell,
              gid_Brand_File_C05_Zip_Faq,
              gid_Brand_File_C05_Zip_Register,
              gid_Brand_File_C05_Htm_Faq,
@@ -652,7 +651,7 @@ File gid_Brand_File_Lib_Npsoplugin
 End
 #endif
 
-File gid_Brand_File_Bmp_IntroAbout
+File gid_Brand_File_Bmp_IntroAboutShell
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = "intro.zip";
@@ -666,13 +665,6 @@ File gid_Brand_File_Images_Brand_Zip
     Styles = (PACKED);
 End
 
-File gid_Brand_File_Bmp_Shell
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program_Shell;
-    Name = "shell.zip";
-    Styles = (ARCHIVE);
-End
-
 File gid_Brand_File_Txt_Package
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Share_Extensions;