368c996b24
The current dependency is already a hack, because there is no way I know of to depend on delivered top-level modules like more_fonts. The original patch parses the gb_Package_MODULE_ooo_fonts list of registered packages to add them as build dependencies. But this is not sufficient, as it just adds the dependencies on the installed / unpacked fonts in the workdir (actually it's just the installer filelist), where they can't be found by the unit test running in the instdir environment. So this converts the depndency into a make error, if either the filelist is missing or the included font files. But if we are in a full run and know the more_fonts module, we simply depend on its delivered files. This needs some minimal changes to gbuild, as neither the delivered file list nor the modules class names are yet available. And this moves the fontconfig handling to extras, where the opensymbol font is already handled. Change-Id: I1b70a4c45ff189266ce56c57e534ddc45e7c5c19 Reviewed-on: https://gerrit.libreoffice.org/74624 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
96 lines
2.4 KiB
Makefile
96 lines
2.4 KiB
Makefile
# -*- 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_Module_Module,extras))
|
|
|
|
$(eval $(call gb_Module_add_targets,extras,\
|
|
CustomTarget_autocorr \
|
|
CustomTarget_autotextuser \
|
|
CustomTarget_glade \
|
|
CustomTarget_tplofficorr \
|
|
CustomTarget_tploffimisc \
|
|
CustomTarget_tplpersonal \
|
|
CustomTarget_tplpresnt \
|
|
CustomTarget_tpl_styles \
|
|
Package_autocorr \
|
|
Package_autotextuser \
|
|
Package_cfgsrvnolang \
|
|
Package_cfgusr \
|
|
Package_database \
|
|
Package_databasebiblio \
|
|
Package_fonts \
|
|
Package_gallbullets \
|
|
Package_gallhtmlexpo \
|
|
Package_gallmytheme \
|
|
Package_gallroot \
|
|
Package_gallsystem \
|
|
Package_gallwwwgraf \
|
|
Package_glade \
|
|
Package_labels \
|
|
$(if $(filter WNT,$(OS)),Package_newfiles) \
|
|
Package_palettes \
|
|
Package_tplofficorr \
|
|
Package_tploffimisc \
|
|
Package_tplpersonal \
|
|
Package_tplpresnt \
|
|
Package_tpl_styles \
|
|
Package_tplwizagenda \
|
|
Package_tplwizbitmap \
|
|
Package_tplwizdesktop \
|
|
Package_tplwizfax \
|
|
Package_tplwizletter \
|
|
Package_tplwizreport \
|
|
Package_tplwizstyles \
|
|
Package_wordbook \
|
|
))
|
|
|
|
$(eval $(call gb_Module_add_l10n_targets,extras,\
|
|
CustomTarget_autotextshare \
|
|
AllLangPackage_autotextshare \
|
|
))
|
|
|
|
ifneq ($(WITH_GALLERY_BUILD),)
|
|
$(eval $(call gb_Module_add_targets,extras,\
|
|
Gallery_arrows \
|
|
Gallery_backgrounds \
|
|
Gallery_computers \
|
|
Gallery_diagrams \
|
|
Gallery_education \
|
|
Gallery_environment \
|
|
Gallery_finance \
|
|
Gallery_people \
|
|
Gallery_symbols \
|
|
Gallery_sound \
|
|
Gallery_txtshapes \
|
|
Gallery_transportation \
|
|
))
|
|
endif
|
|
|
|
$(eval $(call gb_Module_add_targets,extras,\
|
|
Personas \
|
|
))
|
|
|
|
$(eval $(call gb_Module_add_targets,extras,\
|
|
CustomTarget_opensymbol \
|
|
))
|
|
|
|
# For configurations that use fontconfig (cf. inclusion of
|
|
# vcl/unx/generic/fontmanager/fontconfig.cxx in Library_vcl), add
|
|
# instdir/share/fonts/truetype/fc_local.conf when it shall
|
|
# contain content from at least one of external/more_fonts/fc_local.snippet
|
|
# (conditional on MORE_FONTS in BUILD_TYPE) and
|
|
# extras/source/truetype/symbol/fc_local.snippet (unconditional):
|
|
ifneq ($(USING_X11)$(DISABLE_GUI)$(filter ANDROID,$(OS)),)
|
|
$(eval $(call gb_Module_add_targets,extras, \
|
|
CustomTarget_fontconfig \
|
|
Package_fontconfig \
|
|
))
|
|
endif
|
|
|
|
# vim: set noet sw=4 ts=4:
|