Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3812
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/12/3812/1
fdo#60924 autoinstall - gbuild/scp2: add gnome module
Change-Id: I37570787815d85d30eed3b5291e1e4450e5ffd51
---
M Repository.mk
A scp2/AutoInstallLibs_gnome.mk
M scp2/InstallModule_gnome.mk
M scp2/Module_scp2.mk
M scp2/source/gnome/module_gnome.scp
M solenv/gbuild/Helper.mk
6 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/Repository.mk b/Repository.mk
index e04e7ec..9b8b3a4 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -221,6 +221,9 @@
endif
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GNOME, \
+))
+
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,KDE, \
$(if $(ENABLE_KDE),kdebe1) \
$(if $(ENABLE_KDE4),kde4be1) \
diff --git a/scp2/AutoInstallLibs_gnome.mk b/scp2/AutoInstallLibs_gnome.mk
new file mode 100644
index 0000000..c388a29
--- /dev/null
+++ b/scp2/AutoInstallLibs_gnome.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,gnome,GNOME,LIBO_LIB_FILE,auto_Gnome_Lib))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk
index 816f3b2..3a8dd51 100644
--- a/scp2/InstallModule_gnome.mk
+++ b/scp2/InstallModule_gnome.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_InstallModule_InstallModule,scp2/gnome))
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome))
+
$(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\
ENABLE_EVOAB2 \
ENABLE_GCONF \
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index 4173445..ca236c1 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_gnome \
AutoInstallLibs_kde \
AutoInstallLibs_ooo \
AutoInstallLibs_ure \
diff --git a/scp2/source/gnome/module_gnome.scp
b/scp2/source/gnome/module_gnome.scp
index 3a2604d..b496ced 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -27,6 +27,8 @@
#include "macros.inc"
+#include "AutoInstallLibs/gnome"
+
Module gid_Module_Optional_Gnome
ParentID = gid_Module_Optional;
Default = YES;
@@ -36,7 +38,7 @@
#ifdef ENABLE_GNOMEVFS
XpdCheckSolaris = "SUNWgnome-vfs";
#endif
- Files = (
+ Files = (auto_Gnome_lib_ALL
#ifdef ENABLE_EVOAB2
gid_File_Lib_Evoab,
#endif
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index ded46b9..b67c1f7 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 := GNOME KDE OOO URE WRITER
gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
gb_Jar_VALIDGROUPS := URE OOO OXT NONE
--
To view, visit https://gerrit.libreoffice.org/3812
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I37570787815d85d30eed3b5291e1e4450e5ffd51
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
