Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3877
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/77/3877/1
fdo#60924 autoinstall - gbuild/scp2: add onlineupdate module
Change-Id: Ib541799e5bd8c95878d61dadbad2bcca80d44367
---
M Repository.mk
M scp2/InstallModule_onlineupdate.mk
M scp2/Module_scp2.mk
M scp2/source/onlineupdate/module_onlineupdate.scp
M solenv/gbuild/Helper.mk
5 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Repository.mk b/Repository.mk
index 3cbed03..f419beb 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -232,6 +232,9 @@
$(if $(ENABLE_TDE),tdebe1) \
))
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ONLINEUPDATE, \
+))
+
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GNOME, \
))
diff --git a/scp2/InstallModule_onlineupdate.mk
b/scp2/InstallModule_onlineupdate.mk
index 76b1b78..fa9fe75 100644
--- a/scp2/InstallModule_onlineupdate.mk
+++ b/scp2/InstallModule_onlineupdate.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_InstallModule_InstallModule,scp2/onlineupdate))
+$(eval $(call
gb_InstallModule_InstallModule_use_auto_install_libs,scp2/onlineupdate,onlineupdate))
+
$(eval $(call gb_InstallModule_add_scpfiles,scp2/onlineupdate,\
scp2/source/onlineupdate/file_onlineupdate \
))
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index 5bccae0..4c1880b 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_Module_Module,scp2))
$(eval $(call gb_Module_add_targets,scp2,\
+ AutoInstallLibs_onlineupdate \
AutoInstallLibs_graphicfilter \
AutoInstallLibs_tde \
AutoInstallLibs_gnome \
diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp
b/scp2/source/onlineupdate/module_onlineupdate.scp
index 29da635..586edfe 100644
--- a/scp2/source/onlineupdate/module_onlineupdate.scp
+++ b/scp2/source/onlineupdate/module_onlineupdate.scp
@@ -27,6 +27,8 @@
#include "macros.inc"
+#include "AutoInstallLibs/onlineupdate"
+
Module gid_Module_Optional_Onlineupdate
PackageInfo = "packinfo_office.txt";
MOD_NAME_DESC(MODULE_OPT_ONLINEUPDATE);
@@ -34,7 +36,8 @@
ParentID = gid_Module_Optional;
Default = YES;
Styles = ();
- Files = (gid_File_Bin_UnpackUpdate,
+ Files = (auto_Onlineupdate_lib_ALL
+ gid_File_Bin_UnpackUpdate,
gid_File_Lib_Updchk,
gid_File_Lib_Updchkui,
gid_File_Share_Registry_Onlineupdate_Xcd);
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index aa87379..1a1befc 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 := ONLINEUPDATE GRAPHICFILTER GNOME TDE KDE OOO
URE WRITER
gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
gb_Jar_VALIDGROUPS := URE OOO OXT NONE
--
To view, visit https://gerrit.libreoffice.org/3877
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib541799e5bd8c95878d61dadbad2bcca80d44367
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza <marcos.souza....@gmail.com>
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
