From f54478ccfa8f4d2dc0289eec37a3191c922ce627 Mon Sep 17 00:00:00 2001 From: Rene Engelhard Date: Mon, 28 May 2018 16:54:41 +0200 Subject: add --enable-build-opensymbol option to build opens___.ttf from source ... and handle opens___.ttf like unowinreg.dll (-> download.lst/$(TARFILE_LOCATION)) Change-Id: Id4723fb15c4b4b04133dedf97b1262441baa4756 Reviewed-on: https://gerrit.libreoffice.org/54938 Tested-by: Rene Engelhard Tested-by: Jenkins Reviewed-by: Rene Engelhard --- extras/CustomTarget_opensymbol.mk | 23 +++++++++++++++++++++++ extras/Module_extras.mk | 4 ++++ extras/Package_fonts.mk | 6 ++++-- extras/source/truetype/symbol/opens___.ttf | Bin 207400 -> 0 bytes 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 extras/CustomTarget_opensymbol.mk delete mode 100644 extras/source/truetype/symbol/opens___.ttf (limited to 'extras') diff --git a/extras/CustomTarget_opensymbol.mk b/extras/CustomTarget_opensymbol.mk new file mode 100644 index 000000000000..a27718feb377 --- /dev/null +++ b/extras/CustomTarget_opensymbol.mk @@ -0,0 +1,23 @@ +# -*- 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_CustomTarget_CustomTarget,extras/fonts)) + +$(eval $(call gb_CustomTarget_register_targets,extras/fonts,opens___.ttf)) + +ifneq (,$(FONTFORGE)) +$(call gb_CustomTarget_get_workdir,extras/fonts)/opens___.ttf : \ + $(SRCDIR)/extras/source/truetype/symbol/OpenSymbol.sfd + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),FNT,1) + $(FONTFORGE) -lang=ff -c 'Open($$1); Generate($$2)' $< $@ +else +$(call gb_CustomTarget_get_workdir,extras/fonts)/opens___.ttf : \ + $(TARFILE_LOCATION)/$(OPENSYMBOL_TTF) + cp $< $@ +endif diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index 2aa41bda3901..164d38aefd1c 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -68,4 +68,8 @@ $(eval $(call gb_Module_add_targets,extras,\ )) endif +$(eval $(call gb_Module_add_targets,extras,\ + CustomTarget_opensymbol \ +)) + # vim: set noet sw=4 ts=4: diff --git a/extras/Package_fonts.mk b/extras/Package_fonts.mk index 952c8286a5e7..8d2d23cbed6b 100644 --- a/extras/Package_fonts.mk +++ b/extras/Package_fonts.mk @@ -7,8 +7,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,extras_fonts,$(SRCDIR)/extras)) +$(eval $(call gb_Package_Package,extras_fonts,$(call gb_CustomTarget_get_workdir,extras/fonts))) -$(eval $(call gb_Package_add_file,extras_fonts,$(LIBO_SHARE_FOLDER)/fonts/truetype/opens___.ttf,source/truetype/symbol/opens___.ttf)) +$(eval $(call gb_Package_use_customtarget,extras_fonts,extras/fonts)) + +$(eval $(call gb_Package_add_file,extras_fonts,$(LIBO_SHARE_FOLDER)/fonts/truetype/opens___.ttf,opens___.ttf)) # vim: set noet sw=4 ts=4: diff --git a/extras/source/truetype/symbol/opens___.ttf b/extras/source/truetype/symbol/opens___.ttf deleted file mode 100644 index 5a10feb2b8da..000000000000 Binary files a/extras/source/truetype/symbol/opens___.ttf and /dev/null differ -- cgit