Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3919

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/19/3919/1

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

Change-Id: I0ee6ac3fc32356dac6b3cc498d98ab71fdea29ad
---
M Repository.mk
A scp2/AutoInstallLibs_math.scp
M scp2/InstallModule_math.mk
M scp2/Module_scp2.mk
M scp2/source/math/module_math.scp
M solenv/gbuild/Helper.mk
6 files changed, 23 insertions(+), 2 deletions(-)



diff --git a/Repository.mk b/Repository.mk
index 3cbed03..e3af12e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -240,6 +240,9 @@
     $(if $(ENABLE_KDE4),kde4be1) \
 ))
 
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,MATH, \
+))
+
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
        avmedia \
        $(if $(DISABLE_SCRIPTING),,basctl) \
diff --git a/scp2/AutoInstallLibs_math.scp b/scp2/AutoInstallLibs_math.scp
new file mode 100644
index 0000000..a7ceda8
--- /dev/null
+++ b/scp2/AutoInstallLibs_math.scp
@@ -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 9dc1cb6..1c7fdec 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -14,6 +14,7 @@
        AutoInstallLibs_tde \
        AutoInstallLibs_gnome \
        AutoInstallLibs_kde \
+       AutoInstallLibs_math \
        AutoInstallLibs_ooo \
        AutoInstallLibs_ure \
        AutoInstallLibs_writer \
diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp
index f222441..a6fcb62 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 @@
     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_Lib_Sm,gid_File_Lib_Smd,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 aa87379..5ca9b31 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -118,7 +118,7 @@
 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 := GRAPHICFILTER GNOME TDE KDE OOO URE WRITER
+gb_Library_VALIDINSTALLMODULES := GRAPHICFILTER GNOME TDE KDE MATH OOO URE WRITER
 gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
 gb_Jar_VALIDGROUPS := URE OOO OXT NONE
 

-- 
To view, visit https://gerrit.libreoffice.org/3919
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ee6ac3fc32356dac6b3cc498d98ab71fdea29ad
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza <marcos.souza.org@gmail.com>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.