scp2: move writer executables to AutoInstall

Change-Id: Ibcfdd7a8c204a1ec90045ad39ef456237ba80a34

6 files changed, 18 insertions, 17 deletions

diff --git a/Repository.mk b/Repository.mk
index 66efa4ab0e91..628a71ac99eb 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -128,6 +128,13 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,math_brand, \
 	) \
 ))
 
+$(eval $(call gb_Helper_register_executables_for_install,OOO,writer_brand, \
+	$(if $(filter WNT,$(OS)), \
+		sweb \
+		swriter \
+	) \
+))
+
 $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
 	gengal \
 ))
@@ -171,8 +178,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 	$(if $(filter WNT,$(OS)), \
 		quickstart \
 		senddoc \
-		sweb \
-		swriter \
 	) \
 ))
 
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 0970011743e9..0cd226807615 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -47,5 +47,6 @@ $(eval $(call gb_AutoInstall_add_module,winexplorerextwin64,SHLXTHDL_LIB_FILE_CO
 $(eval $(call gb_AutoInstall_add_module,winexplorerextwin64nt6,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64 >= 600"))
 endif
 $(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,writer_brand,,LIBO_EXECUTABLE))
 
 # vim: set noet sw=4 ts=4:
diff --git a/scp2/InstallModule_writer.mk b/scp2/InstallModule_writer.mk
index 69ccf5e52c88..cfc4d9a95dc0 100644
--- a/scp2/InstallModule_writer.mk
+++ b/scp2/InstallModule_writer.mk
@@ -9,7 +9,10 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/writer))
 
-$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/writer,writer))
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/writer,\
+	writer \
+	writer_brand \
+))
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/writer,\
 	ENABLE_MACOSX_SANDBOX \
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index 5653c6d006c8..280e40afa572 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -18,20 +18,11 @@
 
 #include "macros.inc"
 
-#ifndef MACOSX
+#if !defined MACOSX && !defined WNT
 File gid_File_Exe_Swriter
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
-    Name = EXENAME(swriter);
-    Styles = (PACKED);
-End
-#endif
-
-#ifdef WNT
-File gid_File_Exe_Sweb
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = EXENAME(sweb);
+    Name = "swriter";
     Styles = (PACKED);
 End
 #endif
diff --git a/scp2/source/writer/folderitem_writer.scp b/scp2/source/writer/folderitem_writer.scp
index c4f8dbf0adb6..306fc888d230 100644
--- a/scp2/source/writer/folderitem_writer.scp
+++ b/scp2/source/writer/folderitem_writer.scp
@@ -23,8 +23,8 @@ FolderItem gid_Folderitem_Swriter
     Name = "%PRODUCTNAME Writer";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     FolderID = gid_Folder_Staroffice51;
-    FileID = gid_File_Exe_Swriter;
-    IconFile = gid_File_Exe_Swriter;
+    FileID = auto_writer_brand_exe_swriter;
+    IconFile = auto_writer_brand_exe_swriter;
     IconID = 0;
     WkDir = gid_Brand_Dir_Program;
     Parameter = "";
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index 75b8c046178e..987a7c7eb79e 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -19,6 +19,7 @@
 #include "macros.inc"
 
 #include "AutoInstall/writer"
+#include "AutoInstall/writer_brand"
 
 Module gid_Module_Prg_Wrt
     MOD_NAME_DESC(MODULE_PRG_WRT);
@@ -55,7 +56,7 @@ Module gid_Module_Brand_Prg_Wrt
     Minimal = YES;
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Exe_Swriter,gid_File_Exe_Sweb);
+    Files = (auto_writer_brand_ALL,gid_File_Exe_Swriter);
 End
 
 Module gid_Module_Langpack_Writer_Template