Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/3827 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/27/3827/1 fdo#60924 autoinstall - gbuild/scp2: add graphicfilter module Change-Id: I7823b4f0d8b7ab99ef549361a89f12036bf63270 --- M Repository.mk A scp2/AutoInstallLibs_graphicfilter.mk M scp2/InstallModule_graphicfilter.mk M scp2/Module_scp2.mk M scp2/source/graphicfilter/module_graphicfilter.scp M solenv/gbuild/Helper.mk 6 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Repository.mk b/Repository.mk index 7e6c051..fc6e737 100644 --- a/Repository.mk +++ b/Repository.mk @@ -221,6 +221,9 @@ endif +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GRAPHICFILTER, \ +)) + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,TDE, \ $(if $(ENABLE_TDE),tdebe1) \ )) diff --git a/scp2/AutoInstallLibs_graphicfilter.mk b/scp2/AutoInstallLibs_graphicfilter.mk new file mode 100644 index 0000000..08efa78 --- /dev/null +++ b/scp2/AutoInstallLibs_graphicfilter.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,graphicfilter,GRAPHICFILTER,LIBO_LIB_FILE,auto_Graphicfilter_Lib)) + +# vim: set noet sw=4 ts=4: diff --git a/scp2/InstallModule_graphicfilter.mk b/scp2/InstallModule_graphicfilter.mk index b7f2a8c..1858d93 100644 --- a/scp2/InstallModule_graphicfilter.mk +++ b/scp2/InstallModule_graphicfilter.mk @@ -9,6 +9,8 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/graphicfilter)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/graphicfilter,graphicfilter)) + $(eval $(call gb_InstallModule_add_scpfiles,scp2/graphicfilter,\ scp2/source/graphicfilter/file_graphicfilter \ )) diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 67e8a81..5bccae0 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_graphicfilter \ AutoInstallLibs_tde \ AutoInstallLibs_gnome \ AutoInstallLibs_kde \ diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp index cd7e4a6..bd148a8 100644 --- a/scp2/source/graphicfilter/module_graphicfilter.scp +++ b/scp2/source/graphicfilter/module_graphicfilter.scp @@ -27,13 +27,15 @@ #include "macros.inc" +#include "AutoInstallLibs/graphicfilter" + Module gid_Module_Optional_Grfflt PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC ( MODULE_OPTIONAL_GRFFLT ); Sortkey = "600"; ParentID = gid_Module_Optional; Default = YES; - Files = ( + Files = (auto_Graphicfilter_Lib_ALL gid_File_Lib_Svg, gid_File_Lib_Flash, gid_File_Lib_WpftDraw, diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 168cdf7..aa87379 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 := GNOME TDE KDE OOO URE WRITER +gb_Library_VALIDINSTALLMODULES := 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/3827 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7823b4f0d8b7ab99ef549361a89f12036bf63270 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