Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/3878 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/3878/1 fdo#60924: autoinstall onlineupdate libraries Change-Id: I9e06d165351161ff144b7605094a3e490d13d5f2 --- M Repository.mk M scp2/InstallModule_onlineupdate.mk M scp2/source/onlineupdate/file_onlineupdate.scp M scp2/source/onlineupdate/module_onlineupdate.scp 4 files changed, 2 insertions(+), 28 deletions(-) diff --git a/Repository.mk b/Repository.mk index f419beb..e9e9480 100644 --- a/Repository.mk +++ b/Repository.mk @@ -233,6 +233,8 @@ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ONLINEUPDATE, \ + updatecheckui \ + updchk \ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GNOME, \ @@ -419,7 +421,6 @@ spell \ sts \ textfd \ - updatecheckui \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ vclplug_gtk \ vclplug_gtk3 \ @@ -554,7 +555,6 @@ ucphier1 \ ucppkg1 \ unopkgapp \ - updchk \ xmlsecurity \ xsec_fw \ xsec_xmlsec \ diff --git a/scp2/InstallModule_onlineupdate.mk b/scp2/InstallModule_onlineupdate.mk index fa9fe75..feb6e1b 100644 --- a/scp2/InstallModule_onlineupdate.mk +++ b/scp2/InstallModule_onlineupdate.mk @@ -11,10 +11,6 @@ $(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 \ -)) - $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/onlineupdate,\ scp2/source/onlineupdate/module_onlineupdate \ )) diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp index 023097f..f157ac2 100644 --- a/scp2/source/onlineupdate/file_onlineupdate.scp +++ b/scp2/source/onlineupdate/file_onlineupdate.scp @@ -27,16 +27,6 @@ #include "macros.inc" -File gid_File_Lib_Updchk - BIN_FILE_BODY; - Styles = (PACKED); - Dir = gid_Brand_Dir_Program; - Name = SPECIAL_NAME(updchk); - ComponentCondition="ISCHECKFORPRODUCTUPDATES=1"; -End - -STD_LIB_FILE(gid_File_Lib_Updchkui, updatecheckui) - File gid_File_Share_Registry_Onlineupdate_Xcd TXT_FILE_BODY; Styles = (PACKED); @@ -44,12 +34,3 @@ Name = "onlineupdate.xcd"; ComponentCondition="ISCHECKFORPRODUCTUPDATES=1"; End - -#if defined LINUX || defined SOLARIS -File gid_File_Bin_UnpackUpdate - BIN_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = "unpack_update"; - Styles = (PACKED); -End -#endif diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp b/scp2/source/onlineupdate/module_onlineupdate.scp index 586edfe..ce19716 100644 --- a/scp2/source/onlineupdate/module_onlineupdate.scp +++ b/scp2/source/onlineupdate/module_onlineupdate.scp @@ -37,8 +37,5 @@ Default = YES; Styles = (); Files = (auto_Onlineupdate_lib_ALL - gid_File_Bin_UnpackUpdate, - gid_File_Lib_Updchk, - gid_File_Lib_Updchkui, gid_File_Share_Registry_Onlineupdate_Xcd); End -- To view, visit https://gerrit.libreoffice.org/3878 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9e06d165351161ff144b7605094a3e490d13d5f2 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