From 7c898c933cb5c4baa7315bb5547a1b53cb12ea61 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Tue, 28 Oct 2014 22:11:00 +0100
Subject: [PATCH] scp2: move brand executables to AutoInstall

... except for soffice.exe which is referenced by some FolderItem.

Change-Id: Ie5788aa950f0b8526220fb2c8b9281ce934b8a5d
---
 Repository.mk                    | 17 +++++----
 scp2/AutoInstall.mk              |  1 +
 scp2/InstallModule_ooo.mk        |  1 +
 scp2/source/ooo/common_brand.scp | 60 ++++----------------------------
 4 files changed, 20 insertions(+), 59 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index 551a95c6ea17..bf32244e4db9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -80,6 +80,17 @@ $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \
 	$(if $(filter ODK,$(BUILD_TYPE)),uno-skeletonmaker) \
 ))
 
+$(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \
+	$(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
+	soffice_bin \
+	$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
+	$(if $(filter WNT,$(OS)), \
+		unoinfo \
+		unopkg \
+		unopkg_com \
+	) \
+))
+
 $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
 	gengal \
 ))
@@ -94,9 +105,7 @@ endif
 $(eval $(call gb_Helper_register_executables,OOO, \
 	$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), tilebench) \
 	gnome-open-url.bin \
-	$(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
 	$(if $(ENABLE_NPAPI_FROM_BROWSER),pluginapp.bin) \
-	soffice_bin \
 	$(if $(filter $(GUIBASE)$(ENABLE_GTK),unxTRUE), \
 		xid-fullscreen-on-all-monitors \
 	) \
@@ -110,7 +119,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 	vcldemo \
 	tiledrendering \
 	$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \
-	$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
 	xpdfimport \
 	$(if $(filter WNT,$(OS)), \
 		odbcconfig \
@@ -125,9 +133,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 		smath \
 		sweb \
 		swriter \
-		unoinfo \
-		unopkg \
-		unopkg_com \
 	) \
 ))
 
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 1a61765ef4de..78879ce278fe 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_AutoInstall_add_module,activexbinarytable,LIBO_LIB_FILE_BINARYT
 $(eval $(call gb_AutoInstall_add_module,activex,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,activexwin64,LIBO_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64"))
 $(eval $(call gb_AutoInstall_add_module,base,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,brand,,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,crashrep,,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index df767a1f4620..d2ef3f5f5a34 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_InstallModule_InstallModule,scp2/ooo))
 
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\
+	brand \
 	ooo \
 	ooobinarytable \
 	reportbuilder \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index ce5dcbc03619..314dd87cf3f5 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -27,6 +27,7 @@
 
 #include "macros.inc"
 
+#include "AutoInstall/brand"
 #include "AutoInstall/crashrep"
 
 #include "config_folders.h"
@@ -54,15 +55,12 @@ Module gid_Module_Root_Brand
             gid_Brand_Dir_Share_Registry,
             gid_Brand_Dir_Share_Xdg);
     Files = (auto_crashrep_ALL,
+             auto_brand_ALL,
              gid_Brand_File_Bin_Crashreport_Script,
              gid_Brand_File_Gdb_Trace,
              gid_Brand_File_Bin_Soffice,
-             gid_Brand_File_Bin_Soffice_Bin,
              gid_Brand_File_Bin_Soffice_Bin_Manifest,
              gid_Brand_File_Bin_Unoinfo,
-             gid_Brand_File_Bin_Unopkgcom,
-             gid_Brand_File_Bin_Unopkgexe,
-             gid_Brand_File_Bin_Unopkg,
              gid_Brand_File_Bmp_IntroAboutShell,
              gid_Brand_File_Bmp_IntroAboutShell_custom,
 	     gid_Brand_File_Desktophelper_Txt,
@@ -504,35 +502,16 @@ File gid_Brand_File_Bin_Soffice
     Styles = (FILELIST, PACKED);
 End
 
-#else
+#endif
 
+#ifdef WNT
+// TODO: some FolderItem reference this?
 File gid_Brand_File_Bin_Soffice
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(soffice);
     Styles = (PACKED);
 End
-
-#endif
-
-#ifndef MACOSX
-File gid_Brand_File_Bin_Soffice_Bin
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-    Name = "soffice.bin";
-End
-#endif
-
-#if defined UNX && ! defined MACOSX
-
-File gid_File_Bin_QStart_Bin
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-    Name = "oosplash";
-End
-
 #endif
 
 #ifdef WNT
@@ -545,33 +524,15 @@ File gid_Brand_File_Desktophelper_Txt
 End
 #endif
 
-#if !defined MACOSX
+#if !defined MACOSX && !defined WNT
 File gid_Brand_File_Bin_Unoinfo
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
-    Name = EXENAME(unoinfo);
+    Name = "unoinfo";
     Styles = (PACKED);
 End
 #endif
 
-#ifdef WNT
-File gid_Brand_File_Bin_Unopkgcom
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-    Name = "unopkg.com";
-End
-#endif
-
-#ifdef WNT
-File gid_Brand_File_Bin_Unopkgexe
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-    Name = "unopkg.exe";
-End
-#endif
-
 #if defined UNX && !defined MACOSX
 File gid_Brand_File_Script_Unopkg
     BIN_FILE_BODY;
@@ -581,13 +542,6 @@ File gid_Brand_File_Script_Unopkg
 End
 #endif
 
-File gid_Brand_File_Bin_Unopkg
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-    Name = "unopkg.bin";
-End
-
 File gid_Brand_File_Bmp_IntroAboutShell
     TXT_FILE_BODY;
     Dir = FILELIST_DIR;