diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-06-24 08:47:57 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-07-05 20:03:40 +0200 |
| commit | 368c996b24e09c427a30972b3405493328db6779 (patch) | |
| tree | b5eb704df1e21f4942eb73cd999ee7c58853b231 /RepositoryModule_host.mk | |
| parent | 5111baa39117f6e16909566e28a8663a32e25269 (diff) | |
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>
Diffstat (limited to 'RepositoryModule_host.mk')
| -rw-r--r-- | RepositoryModule_host.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index e6f93c869ccd..e3ea0d994b3b 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -11,6 +11,13 @@ $(eval $(call gb_Module_Module,libreoffice)) +# These have to be included before the others for more_fonts dependencies +$(eval $(call gb_Module_add_moduledirs,libreoffice,\ + $(call gb_Helper_optional,MORE_FONTS,external/more_fonts) \ + extras \ +)) + + # This makefile needs to be read first because some variables like T_LIBS # for libmerged are cleared there and then later we append stuff to it # through e.g. gb_Library_use_external for various libraries in libmerged. @@ -55,7 +62,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ eventattacher \ extensions \ external \ - extras \ filter \ $(call gb_Helper_optional,DBCONNECTIVITY,forms) \ formula \ |