[Libreoffice-commits] core.git: Repository.mk scp2/AutoInstallLibs_math.mk scp2/InstallModule_math.mk scp2/Module_scp2.mk scp2/source solenv/gbuild

[Marcos Paulo de Souza]

 Repository.mk                    |    7 +++++--
 scp2/AutoInstallLibs_math.mk     |   12 ++++++++++++
 scp2/InstallModule_math.mk       |    2 ++
 scp2/Module_scp2.mk              |    1 +
 scp2/source/math/file_math.scp   |    4 ----
 scp2/source/math/module_math.scp |    5 ++++-
 solenv/gbuild/Helper.mk          |    2 +-
 7 files changed, 25 insertions(+), 8 deletions(-)

New commits:
commit 8a58bc2535cf0c8459d861d29b342ef39f7f833c
Author: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
Date:   Mon May 27 19:13:14 2013 -0300

    fdo#60924 autoinstall - gbuild/scp2: add math module
    
    Change-Id: I466dd68069576d57740ef34b8f6fcd8f9025c5c8
    Reviewed-on: https://gerrit.libreoffice.org/4065
    Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/Repository.mk b/Repository.mk
index 723d7a3..2b4a3de 100644
--- a/Repository.mk
+++ b/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 \
diff --git a/scp2/AutoInstallLibs_math.mk b/scp2/AutoInstallLibs_math.mk
new file mode 100644
index 0000000..a7ceda8
--- /dev/null
+++ b/scp2/AutoInstallLibs_math.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,math,MATH,LIBO_LIB_FILE,auto_Math_Lib))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/InstallModule_math.mk b/scp2/InstallModule_math.mk
index 57f5c2d..e25c25e 100644
--- a/scp2/InstallModule_math.mk
+++ b/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 \
 ))
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index f34449f..3178920 100644
--- a/scp2/Module_scp2.mk
+++ b/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 \
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index 0c016ee..d9ccc96 100644
--- a/scp2/source/math/file_math.scp
+++ b/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
diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp
index f222441..1626623 100644
--- a/scp2/source/math/module_math.scp
+++ b/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
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 1a1befc..f60ac36 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 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