fdo#60924 autoinstall - gbuild/scp2: add math module

Change-Id: I466dd68069576d57740ef34b8f6fcd8f9025c5c8
Reviewed-on: https://gerrit.libreoffice.org/4065Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

Repository.mk

@@ -252,6 +252,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,KDE, \
     $(if $(ENABLE_KDE4),kde4be1) \
 ))
 
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,MATH, \
+    sm \
+    smd \
+))
+
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
 	avmedia \
 	$(if $(DISABLE_SCRIPTING),,basctl) \
@@ -419,8 +424,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     scfilt \
     scui \
     simplecm \
-    sm \
-    smd \
     solver \
     spa \
     spell \

scp2/AutoInstallLibs_math.mk

+# -*- 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,math,MATH,LIBO_LIB_FILE,auto_Math_Lib))
+
+# vim: set noet sw=4 ts=4:

scp2/InstallModule_math.mk

@@ -9,6 +9,8 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/math))
 
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/math,math))
+
 $(eval $(call gb_InstallModule_add_templates,scp2/math,\
     scp2/source/templates/module_langpack_math \
 ))

scp2/Module_scp2.mk

@@ -15,6 +15,7 @@ $(eval $(call gb_Module_add_targets,scp2,\
 	AutoInstallLibs_tde \
 	AutoInstallLibs_gnome \
 	AutoInstallLibs_kde \
+	AutoInstallLibs_math \
 	AutoInstallLibs_ooo \
 	AutoInstallLibs_ure \
 	AutoInstallLibs_writer \

scp2/source/math/file_math.scp

@@ -27,10 +27,6 @@
 
 #include "macros.inc"
 
-STD_LIB_FILE( gid_File_Lib_Sm , sm)
-
-STD_LIB_FILE( gid_File_Lib_Smd , smd)
-
 STD_RES_FILE( gid_File_Res_Sm, sm )
 
 File gid_File_Share_Registry_Math_Xcd

scp2/source/math/module_math.scp

@@ -27,6 +27,8 @@
 
 #include "macros.inc"
 
+#include "AutoInstallLibs/math"
+
 Module gid_Module_Prg_Math
     MOD_NAME_DESC ( MODULE_PRG_MATH );
     ParentID = gid_Module_Prg;
@@ -42,7 +44,8 @@ Module gid_Module_Prg_Math_Bin
     Minimal = YES;
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math,
+    Files = (auto_Math_Lib_ALL
+	gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math,
     gid_File_Share_Registry_Math_Xcd,
     gid_File_Tmp_Userinstall_Math_Inf);
 End

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 RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS
-gb_Library_VALIDINSTALLMODULES := ONLINEUPDATE GRAPHICFILTER GNOME TDE KDE OOO URE WRITER
+gb_Library_VALIDINSTALLMODULES := ONLINEUPDATE GRAPHICFILTER GNOME TDE KDE MATH OOO URE WRITER
 gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
 gb_Jar_VALIDGROUPS := URE OOO OXT NONE