[PATCH] fdo#60924 autoinstall - gbuild/scp2: add tde module

[Marcos Souza (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3808

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/08/3808/1

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

Change-Id: I4c13d1cd4b7490a0b4db8f0dd40d823a5906c8aa
---
M Repository.mk
A scp2/AutoInstallLibs_tde.mk
M scp2/InstallModule_tde.mk
M scp2/Module_scp2.mk
M scp2/source/tde/module_tde.scp
M solenv/gbuild/Helper.mk
6 files changed, 22 insertions(+), 2 deletions(-)



diff --git a/Repository.mk b/Repository.mk
index e04e7ec..18ce81b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -221,6 +221,9 @@
 
 endif
 
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,TDE, \
+))
+
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,KDE, \
     $(if $(ENABLE_KDE),kdebe1) \
     $(if $(ENABLE_KDE4),kde4be1) \
diff --git a/scp2/AutoInstallLibs_tde.mk b/scp2/AutoInstallLibs_tde.mk
new file mode 100644
index 0000000..daea3c3
--- /dev/null
+++ b/scp2/AutoInstallLibs_tde.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,tde,TDE,LIBO_LIB_FILE,auto_Tde_Lib))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/InstallModule_tde.mk b/scp2/InstallModule_tde.mk
index f42ef03..ad7655e 100644
--- a/scp2/InstallModule_tde.mk
+++ b/scp2/InstallModule_tde.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/tde))
 
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/tde,tde))
+
 $(eval $(call gb_InstallModule_define_if_set,scp2/tde,\
 	ENABLE_TDE \
 	ENABLE_TDEAB \
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index 4173445..b5bb1f0 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_tde \
 	AutoInstallLibs_kde \
 	AutoInstallLibs_ooo \
 	AutoInstallLibs_ure \
diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp
index e302c54..2cadd97 100644
--- a/scp2/source/tde/module_tde.scp
+++ b/scp2/source/tde/module_tde.scp
@@ -24,6 +24,8 @@
 
 #include "macros.inc"
 
+#include "AutoInstallLibs/tde"
+
 #if defined( ENABLE_TDE )
 Module gid_Module_Optional_Tde
     ParentID = gid_Module_Optional;
@@ -31,7 +33,7 @@
     PackageInfo = "packinfo_office.txt";
     MOD_NAME_DESC(MODULE_OPTIONAL_TDE);
     Styles = ();
-    Files = (
+    Files = (auto_Tde_Lib_ALL
 #ifdef ENABLE_TDE
     gid_File_Lib_Tdebe
 #endif // ENABLE_TDE
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index ded46b9..fd395f7 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 := KDE OOO URE WRITER
+gb_Library_VALIDINSTALLMODULES := TDE KDE OOO URE WRITER
 gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
 gb_Jar_VALIDGROUPS := URE OOO OXT NONE
 

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

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