From 41946925ee87808e31956ee2cf5a92c1e5d3613a Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 30 Oct 2012 14:26:00 +0100 Subject: more_fonts: convert to ExternalPackage for incremental builds Change-Id: Id24975e0bc9a28f6c66599c4b58c01471dd2d8ef --- more_fonts/ExternalPackage_dejavu.mk | 38 +++++++++++++++++++++++++ more_fonts/ExternalPackage_gentium.mk | 25 ++++++++++++++++ more_fonts/ExternalPackage_liberation.mk | 29 +++++++++++++++++++ more_fonts/ExternalPackage_liberation_narrow.mk | 21 ++++++++++++++ more_fonts/ExternalPackage_libertineg.mk | 27 ++++++++++++++++++ more_fonts/Module_more_fonts.mk | 10 +++---- more_fonts/Package_dejavu.mk | 38 ------------------------- more_fonts/Package_gentium.mk | 25 ---------------- more_fonts/Package_liberation.mk | 31 -------------------- more_fonts/Package_liberation_narrow.mk | 21 -------------- more_fonts/Package_libertineg.mk | 28 ------------------ 11 files changed, 145 insertions(+), 148 deletions(-) create mode 100644 more_fonts/ExternalPackage_dejavu.mk create mode 100644 more_fonts/ExternalPackage_gentium.mk create mode 100644 more_fonts/ExternalPackage_liberation.mk create mode 100644 more_fonts/ExternalPackage_liberation_narrow.mk create mode 100644 more_fonts/ExternalPackage_libertineg.mk delete mode 100644 more_fonts/Package_dejavu.mk delete mode 100644 more_fonts/Package_gentium.mk delete mode 100644 more_fonts/Package_liberation.mk delete mode 100644 more_fonts/Package_liberation_narrow.mk delete mode 100644 more_fonts/Package_libertineg.mk (limited to 'more_fonts') diff --git a/more_fonts/ExternalPackage_dejavu.mk b/more_fonts/ExternalPackage_dejavu.mk new file mode 100644 index 000000000000..c1209eca5697 --- /dev/null +++ b/more_fonts/ExternalPackage_dejavu.mk @@ -0,0 +1,38 @@ +# -*- 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_ExternalPackage_ExternalPackage,font_dejavu_inc,font_dejavu)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,font_dejavu_inc,pck,\ + ttf/DejaVuSans-Bold.ttf \ + ttf/DejaVuSans-BoldOblique.ttf \ + ttf/DejaVuSans-ExtraLight.ttf \ + ttf/DejaVuSans-Oblique.ttf \ + ttf/DejaVuSans.ttf \ + ttf/DejaVuSansCondensed-Bold.ttf \ + ttf/DejaVuSansCondensed-BoldOblique.ttf \ + ttf/DejaVuSansCondensed-Oblique.ttf \ + ttf/DejaVuSansCondensed.ttf \ + ttf/DejaVuSansMono-Bold.ttf \ + ttf/DejaVuSansMono-BoldOblique.ttf \ + ttf/DejaVuSansMono-Oblique.ttf \ + ttf/DejaVuSansMono.ttf \ + ttf/DejaVuSerif-Bold.ttf \ + ttf/DejaVuSerif-BoldItalic.ttf \ + ttf/DejaVuSerif-Italic.ttf \ + ttf/DejaVuSerif.ttf \ + ttf/DejaVuSerifCondensed-Bold.ttf \ + ttf/DejaVuSerifCondensed-BoldItalic.ttf \ + ttf/DejaVuSerifCondensed-Italic.ttf \ + ttf/DejaVuSerifCondensed.ttf \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_file,font_dejavu_lic,pck/License_dejavu.txt,LICENSE)) + +# vim: set noet sw=4 ts=4: diff --git a/more_fonts/ExternalPackage_gentium.mk b/more_fonts/ExternalPackage_gentium.mk new file mode 100644 index 000000000000..3992d2b98625 --- /dev/null +++ b/more_fonts/ExternalPackage_gentium.mk @@ -0,0 +1,25 @@ +# -*- 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_ExternalPackage_ExternalPackage,font_gentium_inc,font_gentium)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,font_gentium_inc,pck,\ + GenBasB.ttf \ + GenBasBI.ttf \ + GenBasI.ttf \ + GenBasR.ttf \ + GenBkBasB.ttf \ + GenBkBasBI.ttf \ + GenBkBasI.ttf \ + GenBkBasR.ttf \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_file,font_gentium_inc,pck/License_gentium.txt,OFL.txt)) + +# vim: set noet sw=4 ts=4: diff --git a/more_fonts/ExternalPackage_liberation.mk b/more_fonts/ExternalPackage_liberation.mk new file mode 100644 index 000000000000..a0aae9a8a041 --- /dev/null +++ b/more_fonts/ExternalPackage_liberation.mk @@ -0,0 +1,29 @@ +# -*- 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_ExternalPackage_ExternalPackage,font_liberation_inc,font_liberation)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,font_liberation_inc,pck,\ + LiberationMono-Bold.ttf \ + LiberationMono-BoldItalic.ttf \ + LiberationMono-Italic.ttf \ + LiberationMono-Regular.ttf \ + LiberationSans-Bold.ttf \ + LiberationSans-BoldItalic.ttf \ + LiberationSans-Italic.ttf \ + LiberationSans-Regular.ttf \ + LiberationSerif-Bold.ttf \ + LiberationSerif-BoldItalic.ttf \ + LiberationSerif-Italic.ttf \ + LiberationSerif-Regular.ttf \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_file,font_liberation_inc,pck/License_liberation.txt,LICENSE)) + +# vim: set noet sw=4 ts=4: diff --git a/more_fonts/ExternalPackage_liberation_narrow.mk b/more_fonts/ExternalPackage_liberation_narrow.mk new file mode 100644 index 000000000000..2672d75a84ad --- /dev/null +++ b/more_fonts/ExternalPackage_liberation_narrow.mk @@ -0,0 +1,21 @@ +# -*- 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_ExternalPackage_ExternalPackage,font_liberation_narrow_inc,font_liberation_narrow)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,font_liberation_narrow_inc,pck,\ + LiberationSansNarrow-Bold.ttf \ + LiberationSansNarrow-BoldItalic.ttf \ + LiberationSansNarrow-Italic.ttf \ + LiberationSansNarrow-Regular.ttf \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_file,font_liberation_narrow_inc,pck/License_liberation_narrow.txt,License.txt)) + +# vim: set noet sw=4 ts=4: diff --git a/more_fonts/ExternalPackage_libertineg.mk b/more_fonts/ExternalPackage_libertineg.mk new file mode 100644 index 000000000000..f0e8af2ef2c8 --- /dev/null +++ b/more_fonts/ExternalPackage_libertineg.mk @@ -0,0 +1,27 @@ +# -*- 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_ExternalPackage_ExternalPackage,font_libertineg_inc,font_libertineg)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,font_libertineg_inc,pck,\ + LinBiolinum_RB_G.ttf \ + LinBiolinum_RI_G.ttf \ + LinBiolinum_R_G.ttf \ + LinLibertine_DR_G.ttf \ + LinLibertine_RBI_G.ttf \ + LinLibertine_RB_G.ttf \ + LinLibertine_RI_G.ttf \ + LinLibertine_RZI_G.ttf \ + LinLibertine_RZ_G.ttf \ + LinLibertine_R_G.ttf \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_file,font_libertineg_inc,pck/License_libertineg.txt,OFL.txt)) + +# vim: set noet sw=4 ts=4: diff --git a/more_fonts/Module_more_fonts.mk b/more_fonts/Module_more_fonts.mk index 7beb2d5abaa5..f054b21bc87d 100644 --- a/more_fonts/Module_more_fonts.mk +++ b/more_fonts/Module_more_fonts.mk @@ -11,11 +11,11 @@ $(eval $(call gb_Module_Module,more_fonts)) $(eval $(call gb_Module_add_targets,more_fonts,\ Package_conf \ - Package_dejavu \ - Package_gentium \ - Package_liberation \ - Package_liberation_narrow \ - Package_libertineg \ + ExternalPackage_dejavu \ + ExternalPackage_gentium \ + ExternalPackage_liberation \ + ExternalPackage_liberation_narrow \ + ExternalPackage_libertineg \ UnpackedTarball_dejavu \ UnpackedTarball_gentium \ UnpackedTarball_liberation \ diff --git a/more_fonts/Package_dejavu.mk b/more_fonts/Package_dejavu.mk deleted file mode 100644 index f7dc3b834229..000000000000 --- a/more_fonts/Package_dejavu.mk +++ /dev/null @@ -1,38 +0,0 @@ -# -*- 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_Package_Package,font_dejavu_inc,$(call gb_UnpackedTarball_get_dir,font_dejavu))) - -$(eval $(call gb_Package_use_unpacked,font_dejavu_inc,font_dejavu)) - -$(eval $(call gb_Package_add_files,font_dejavu_inc,pck,\ - ttf/DejaVuSans-Bold.ttf \ - ttf/DejaVuSans-BoldOblique.ttf \ - ttf/DejaVuSans-ExtraLight.ttf \ - ttf/DejaVuSans-Oblique.ttf \ - ttf/DejaVuSans.ttf \ - ttf/DejaVuSansCondensed-Bold.ttf \ - ttf/DejaVuSansCondensed-BoldOblique.ttf \ - ttf/DejaVuSansCondensed-Oblique.ttf \ - ttf/DejaVuSansCondensed.ttf \ - ttf/DejaVuSansMono-Bold.ttf \ - ttf/DejaVuSansMono-BoldOblique.ttf \ - ttf/DejaVuSansMono-Oblique.ttf \ - ttf/DejaVuSansMono.ttf \ - ttf/DejaVuSerif-Bold.ttf \ - ttf/DejaVuSerif-BoldItalic.ttf \ - ttf/DejaVuSerif-Italic.ttf \ - ttf/DejaVuSerif.ttf \ - ttf/DejaVuSerifCondensed-Bold.ttf \ - ttf/DejaVuSerifCondensed-BoldItalic.ttf \ - ttf/DejaVuSerifCondensed-Italic.ttf \ - ttf/DejaVuSerifCondensed.ttf \ -)) - -$(eval $(call gb_Package_add_file,font_dejavu_lic,pck/License_dejavu.txt,LICENSE)) diff --git a/more_fonts/Package_gentium.mk b/more_fonts/Package_gentium.mk deleted file mode 100644 index 2e9093a22db0..000000000000 --- a/more_fonts/Package_gentium.mk +++ /dev/null @@ -1,25 +0,0 @@ -# -*- 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_Package_Package,font_gentium_inc,$(call gb_UnpackedTarball_get_dir,font_gentium))) - -$(eval $(call gb_Package_use_unpacked,font_gentium_inc,font_gentium)) - -$(eval $(call gb_Package_add_files,font_gentium_inc,pck,\ - GenBasB.ttf \ - GenBasBI.ttf \ - GenBasI.ttf \ - GenBasR.ttf \ - GenBkBasB.ttf \ - GenBkBasBI.ttf \ - GenBkBasI.ttf \ - GenBkBasR.ttf \ -)) - -$(eval $(call gb_Package_add_file,font_gentium_inc,pck/License_gentium.txt,OFL.txt)) diff --git a/more_fonts/Package_liberation.mk b/more_fonts/Package_liberation.mk deleted file mode 100644 index 525736e2dfa7..000000000000 --- a/more_fonts/Package_liberation.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- 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_Package_Package,font_liberation_inc,$(call gb_UnpackedTarball_get_dir,font_liberation))) - -$(eval $(call gb_Package_use_unpacked,font_liberation_inc,font_liberation)) - -$(eval $(call gb_Package_add_files,font_liberation_inc,pck,\ - LiberationMono-Bold.ttf \ - LiberationMono-BoldItalic.ttf \ - LiberationMono-Italic.ttf \ - LiberationMono-Regular.ttf \ - LiberationSans-Bold.ttf \ - LiberationSans-BoldItalic.ttf \ - LiberationSans-Italic.ttf \ - LiberationSans-Regular.ttf \ - LiberationSerif-Bold.ttf \ - LiberationSerif-BoldItalic.ttf \ - LiberationSerif-Italic.ttf \ - LiberationSerif-Regular.ttf \ -)) - -$(eval $(call gb_Package_add_file,font_liberation_inc,pck/License_liberation.txt,LICENSE)) - -# vim: set noet sw=4 ts=4: diff --git a/more_fonts/Package_liberation_narrow.mk b/more_fonts/Package_liberation_narrow.mk deleted file mode 100644 index 7135589de67d..000000000000 --- a/more_fonts/Package_liberation_narrow.mk +++ /dev/null @@ -1,21 +0,0 @@ -# -*- 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_Package_Package,font_liberation_narrow_inc,$(call gb_UnpackedTarball_get_dir,font_liberation_narrow))) - -$(eval $(call gb_Package_use_unpacked,font_liberation_narrow_inc,font_liberation_narrow)) - -$(eval $(call gb_Package_add_files,font_liberation_narrow_inc,pck,\ - LiberationSansNarrow-Bold.ttf \ - LiberationSansNarrow-BoldItalic.ttf \ - LiberationSansNarrow-Italic.ttf \ - LiberationSansNarrow-Regular.ttf \ -)) - -$(eval $(call gb_Package_add_file,font_liberation_narrow_inc,pck/License_liberation_narrow.txt,License.txt)) diff --git a/more_fonts/Package_libertineg.mk b/more_fonts/Package_libertineg.mk deleted file mode 100644 index 644d29f86734..000000000000 --- a/more_fonts/Package_libertineg.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -*- 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_Package_Package,font_libertineg_inc,$(call gb_UnpackedTarball_get_dir,font_libertineg))) - -$(eval $(call gb_Package_use_unpacked,font_libertineg_inc,font_libertineg)) - -$(eval $(call gb_Package_add_files,font_libertineg_inc,pck,\ - LinBiolinum_RB_G.ttf \ - LinBiolinum_RI_G.ttf \ - LinBiolinum_R_G.ttf \ - LinLibertine_DR_G.ttf \ - LinLibertine_RBI_G.ttf \ - LinLibertine_RB_G.ttf \ - LinLibertine_RI_G.ttf \ - LinLibertine_RZI_G.ttf \ - LinLibertine_RZ_G.ttf \ - LinLibertine_R_G.ttf \ -)) - -$(eval $(call gb_Package_add_file,font_libertineg_inc,pck/License_libertineg.txt,OFL.txt)) - -- cgit v1.2.3