strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/solenv/gbuild/TestHelpers.mk

48 lines
1.9 KiB
Makefile
Raw Normal View History

Fix makefile modelines (cf. TEMPLATE.SOURCECODE.HEADER) Change-Id: I0fb78f097273b838291241ccf63c308003cac89c Reviewed-on: https://gerrit.libreoffice.org/79306 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-09-20 10:04:25 -05:00
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; fill-column: 100 -*-
Make font-based unit test depend on instdir fonts 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>
2019-06-24 01:47:57 -05:00
#
# 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/.
#
# This makes sure that more_fonts, opensymbol and fontconfig is installed
define gb_TestHelpers_use_more_fonts
Don't error more_fonts on the clean target Regression from commit 368c996b24e0 ("Make font-based unit test depend on instdir fonts") Change-Id: Ie106894803b84430f9b7d9bfd97c420d6eb29506 Reviewed-on: https://gerrit.libreoffice.org/75747 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-07-16 15:02:52 -05:00
ifneq ($(MAKECMDGOALS),clean)
Make font-based unit test depend on instdir fonts 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>
2019-06-24 01:47:57 -05:00
ifneq (,$$(filter MORE_FONTS,$$(BUILD_TYPE)))
ifeq (,$$(filter more_fonts,$$(gb_Module_ALLMODULES)))
# the gbuildtojson / gbuild self-test runs tests "out of scope", but itself depends
# on more fonts, so we must ignore the font tests for these tests.
ifeq (,$$(gb_IGNORE_MORE_FONTS))
# we are in single module mode -> fail test on missing fonts from filelists!
# include Module_more_font.mk fails with strange error messages,
# so we can't check if the more_fonts filelists are up-to-date, so just assume it.
$(1): \
$$(foreach font,$$(gb_Package_MODULE_ooo_fonts), \
$$(if $$(wildcard $$(call gb_Package_get_target,$$(font))), \
$$(foreach file,$$(shell cat $$(call gb_Package_get_target,$$(font))), \
$$(if $$(wildcard $$(file)),,$$(error Missing font -> run make more_fonts extras))), \
$$(error Missing font filelist -> run make more_fonts extras)))
endif
else
# we're in global run mode (full knowledge) -> depend directly on the delivered fonts!
$(1): \
$$(foreach package,$$(subst ExternalPackage_,,$$(filter ExternalPackage_%,$$(call gb_Module_get_classnames,more_fonts))), \
$$(call gb_Package_get_files,$$(package))) \
$$(call gb_Package_get_files,extras_font) \
$$(if $$(filter Package_extras_fontconfig,$$(call gb_Module_get_classnames,extras)), \
$$(call gb_Package_get_files,extras_fontconfig))
endif
endif
Don't error more_fonts on the clean target Regression from commit 368c996b24e0 ("Make font-based unit test depend on instdir fonts") Change-Id: Ie106894803b84430f9b7d9bfd97c420d6eb29506 Reviewed-on: https://gerrit.libreoffice.org/75747 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-07-16 15:02:52 -05:00
endif
Make font-based unit test depend on instdir fonts 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>
2019-06-24 01:47:57 -05:00
endef
Fix makefile modelines (cf. TEMPLATE.SOURCECODE.HEADER) Change-Id: I0fb78f097273b838291241ccf63c308003cac89c Reviewed-on: https://gerrit.libreoffice.org/79306 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-09-20 10:04:25 -05:00
# vim: set noet sw=4 ts=4:
Reference in a new issue Copy permalink