fdo#60924 autoinstall: add writer section; also add more libs

Change-Id: I765e36aa95d0bcfb62b696d5db1fb151ba33da2c

7 files changed, 29 insertions, 24 deletions

diff --git a/Repository.mk b/Repository.mk
index dbeddbd69eba..fa771222c794 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -243,16 +243,23 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
     fwl \
 	fwm \
     lng \
-    lwpft \
     $(if $(MERGELIBS),merged) \
     sdbt \
     odbcbase \
-    t602filter \
 	$(if $(ENABLE_TELEPATHY),tubes) \
     unordf \
     unoxml \
-    wpftwriter \
-    writerfilter \
+))
+
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \
+	hwp \
+	lwpft \
+	msword \
+	swd \
+	swui \
+	t602filter \
+	wpftwriter \
+	writerfilter \
 ))
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
@@ -302,7 +309,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     graphicfilter \
     guesslang \
     helplinker \
-    hwp \
     hyphen \
 	icd \
 	icg \
@@ -326,7 +332,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     mozab2 \
     mozabdrv \
     msfilter \
-    msword \
 	mysql \
     odfflatxml \
     offacc \
@@ -368,8 +373,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     svx \
     svxcore \
     sw \
-    swd \
-    swui \
 	tdeab1 \
 	tdeabdrv1 \
     textconversiondlgs \
diff --git a/scp2/AutoInstallLibs_writer.mk b/scp2/AutoInstallLibs_writer.mk
new file mode 100644
index 000000000000..68bd7a4f3db5
--- /dev/null
+++ b/scp2/AutoInstallLibs_writer.mk
@@ -0,0 +1,12 @@
+# -*- 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_AutoInstallLibs_AutoInstallLibs,writer,WRITER,LIBO_LIB_FILE,auto_Writer_Lib))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/InstallModule_writer.mk b/scp2/InstallModule_writer.mk
index 7306f8c617d7..072fb17b6bc0 100644
--- a/scp2/InstallModule_writer.mk
+++ b/scp2/InstallModule_writer.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/writer))
 
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/writer,writer))
+
 $(eval $(call gb_InstallModule_add_templates,scp2/writer,\
     scp2/source/templates/module_langpack_writer \
 ))
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index edb44674d174..604bcca44abf 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1114,9 +1114,6 @@ STD_LIB_FILE( gid_File_Lib_Editeng, editeng)
 STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)
 
 STD_LIB_FILE( gid_File_Lib_Sw , sw)
-STD_LIB_FILE( gid_File_Lib_Swui, swui)
-
-STD_LIB_FILE( gid_File_Lib_Msword, msword )
 
 #if ! defined UNX
 File gid_File_Lib_Sysdtrans
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index a7cd9edd7066..19e4efa3703d 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -27,10 +27,6 @@
 
 #include "macros.inc"
 
-STD_LIB_FILE(gid_File_Lib_Swd, swd)
-
-STD_LIB_FILE(gid_File_Lib_Hwpreader, hwp)
-
 File gid_File_Exe_Swriter
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index 8aafb19a71b6..1efaec28a021 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -27,6 +27,8 @@
 
 #include "macros.inc"
 
+#include "AutoInstallLibs/writer"
+
 Module gid_Module_Prg_Wrt
     MOD_NAME_DESC(MODULE_PRG_WRT);
     ParentID = gid_Module_Prg;
@@ -44,15 +46,8 @@ Module gid_Module_Prg_Wrt_Bin
     Styles = (HIDDEN_ROOT);
     Files = (gid_File_Bin_Cde_Sagenda,gid_File_Bin_Cde_Sfax,gid_File_Bin_Cde_Slabel,
     gid_File_Bin_Cde_Sletter,gid_File_Bin_Cde_Smemo,gid_File_Bin_Cde_Svcard,
-    gid_File_Lib_Hwpreader,
-    gid_File_Lib_Swd,
-    gid_File_Lib_Swui,
-    gid_File_Lib_Msword,
-    auto_File_Lib_wpftwriter,
-    auto_File_Lib_t602filter,
+    auto_Writer_Lib_ALL,
     gid_File_Lib_Vbaswobj,
-    auto_File_Lib_writerfilter,
-    auto_File_Lib_lwpft,
     gid_File_Jar_Email, 
     gid_File_Jar_Mail, 
     gid_File_Jar_Activation,
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 05e5489164fd..520a4d9f30c1 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -118,7 +118,7 @@ endef
 define gb_Helper_init_registries
 gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE
 gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS EXTENSIONLIBS
-gb_Library_VALIDINSTALLMODULES := OOO URE
+gb_Library_VALIDINSTALLMODULES := OOO URE WRITER
 gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
 gb_Jar_VALIDGROUPS := URE OOO OXT