From 557f58d1cfac2d602c3cc74927eea9e771fe5d67 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Tue, 28 Oct 2014 23:51:16 +0100
Subject: [PATCH] scp2: move draw executables to AutoInstall

Change-Id: I6f7642a39fb72cfed85638cdd9015bf0aced8a20
---
 Repository.mk                        | 7 ++++++-
 scp2/AutoInstall.mk                  | 1 +
 scp2/InstallModule_draw.mk           | 4 ++++
 scp2/source/draw/file_draw.scp       | 4 ++--
 scp2/source/draw/folderitem_draw.scp | 4 ++--
 scp2/source/draw/module_draw.scp     | 4 +++-
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index 8f3e005cbb85..0125aa4414e1 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -110,6 +110,12 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,calc_brand, \
 	) \
 ))
 
+$(eval $(call gb_Helper_register_executables_for_install,OOO,draw_brand, \
+	$(if $(filter WNT,$(OS)), \
+		sdraw \
+	) \
+))
+
 $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
 	gengal \
 ))
@@ -152,7 +158,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 	$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \
 	$(if $(filter WNT,$(OS)), \
 		quickstart \
-		sdraw \
 		senddoc \
 		simpress \
 		smath \
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index eaa1666caa3a..1bad46f3aab1 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -18,6 +18,7 @@ $(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,calc_brand,,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,crashrep,,LIBO_EXECUTABLE))
+$(eval $(call gb_AutoInstall_add_module,draw_brand,,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
 $(eval $(call gb_AutoInstall_add_module,extensions_rhino,,,LIBO_JAR_FILE))
 $(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE))
diff --git a/scp2/InstallModule_draw.mk b/scp2/InstallModule_draw.mk
index 0ec9c4f61d01..a7c02bef4bac 100644
--- a/scp2/InstallModule_draw.mk
+++ b/scp2/InstallModule_draw.mk
@@ -9,6 +9,10 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/draw))
 
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/draw,\
+	draw_brand \
+))
+
 $(eval $(call gb_InstallModule_define_if_set,scp2/draw,\
 	ENABLE_MACOSX_SANDBOX \
 ))
diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp
index 74285e0ed00f..4f8d610d7feb 100644
--- a/scp2/source/draw/file_draw.scp
+++ b/scp2/source/draw/file_draw.scp
@@ -33,11 +33,11 @@ File gid_File_Help_Sdraw_Zip
 End
 #endif
 
-#ifndef MACOSX
+#if !defined MACOSX && !defined WNT
 File gid_File_Exe_Sdraw
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
-    Name = EXENAME(sdraw);
+    Name = "sdraw";
     Styles = (PACKED);
 End
 #endif
diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp
index f6927072fe7e..5dc8757e96f3 100644
--- a/scp2/source/draw/folderitem_draw.scp
+++ b/scp2/source/draw/folderitem_draw.scp
@@ -23,8 +23,8 @@ FolderItem gid_Folderitem_Sdraw
     Name = "%PRODUCTNAME Draw";
     ModuleID = gid_Module_Prg_Draw_Bin;
     FolderID = gid_Folder_Staroffice51;
-    FileID = gid_File_Exe_Sdraw;
-    IconFile = gid_File_Exe_Sdraw;
+    FileID = auto_draw_brand_exe_sdraw;
+    IconFile = auto_draw_brand_exe_sdraw;
     IconID = 0;
     WkDir = gid_Brand_Dir_Program;
     Parameter = "";
diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
index c0dc5811f005..a2db15d9aac0 100644
--- a/scp2/source/draw/module_draw.scp
+++ b/scp2/source/draw/module_draw.scp
@@ -18,6 +18,8 @@
 
 #include "macros.inc"
 
+#include "AutoInstall/draw_brand"
+
 Module gid_Module_Prg_Draw
     MOD_NAME_DESC ( MODULE_PRG_DRAW );
     ParentID = gid_Module_Prg;
@@ -48,7 +50,7 @@ Module gid_Module_Brand_Prg_Draw
     Minimal = YES;
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Exe_Sdraw);
+    Files = (auto_draw_brand_ALL,gid_File_Exe_Sdraw);
 End
 
 Module gid_Module_Langpack_Draw_Template