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

[Marcos Paulo de Souza]

 Repository.mk                                    |    7 +++++--
 scp2/AutoInstallLibs_onlineupdate.mk             |   12 ++++++++++++
 scp2/InstallModule_onlineupdate.mk               |    2 ++
 scp2/Module_scp2.mk                              |    1 +
 scp2/source/onlineupdate/file_onlineupdate.scp   |   10 ----------
 scp2/source/onlineupdate/module_onlineupdate.scp |    7 ++++---
 solenv/gbuild/Helper.mk                          |    2 +-
 7 files changed, 25 insertions(+), 16 deletions(-)

New commits:
commit 2feb756dd5ff486a3972cf676f6f1d07017bf0f6
Author: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
Date:   Sun May 12 19:53:17 2013 -0300

    fdo#60924 autoinstall - gbuild/scp2: add onlineupdate module
    
    Change-Id: Ib541799e5bd8c95878d61dadbad2bcca80d44367

diff --git a/Repository.mk b/Repository.mk
index 5f0dc59..c6a779d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -232,6 +232,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,TDE, \
     $(if $(ENABLE_TDE),tdebe1) \
 ))
 
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ONLINEUPDATE, \
+    updatecheckui \
+    updchk \
+))
+
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GNOME, \
     $(if $(ENABLE_EVOAB2),evoab) \
     $(if $(ENABLE_GTK),vclplug_gtk) \
@@ -422,7 +427,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     spell \
     sts \
     textfd \
-    updatecheckui \
     $(if $(DISABLE_SCRIPTING),,vbahelper) \
     vclplug_tde \
     vclplug_kde \
@@ -555,7 +559,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
     ucphier1 \
     ucppkg1 \
     unopkgapp \
-    updchk \
     xmlsecurity \
     xsec_fw \
     xsec_xmlsec \
diff --git a/scp2/AutoInstallLibs_onlineupdate.mk b/scp2/AutoInstallLibs_onlineupdate.mk
new file mode 100644
index 0000000..cd082bb
--- /dev/null
+++ b/scp2/AutoInstallLibs_onlineupdate.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,onlineupdate,ONLINEUPDATE,LIBO_LIB_FILE,auto_Onlineupdate_Lib))
+
+# vim: set noet sw=4 ts=4:
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 9dc1cb6..f34449f 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/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp
index 023097f..c7a952f 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);
diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp b/scp2/source/onlineupdate/module_onlineupdate.scp
index 29da635..89f8064 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,8 +36,7 @@ Module gid_Module_Optional_Onlineupdate
     ParentID = gid_Module_Optional;
     Default = YES;
     Styles = ();
-    Files = (gid_File_Bin_UnpackUpdate,
-             gid_File_Lib_Updchk,
-             gid_File_Lib_Updchkui,
+    Files = (auto_Onlineupdate_Lib_ALL
+             gid_File_Bin_UnpackUpdate,
              gid_File_Share_Registry_Onlineupdate_Xcd);
 End
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 @@ 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 := 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