gbuildification of more_fonts

Change-Id: Ifae1342ee0af447cb08a24e0804f6e42ae826a2a

16 files changed, 265 insertions, 20 deletions

diff --git a/more_fonts/Makefile b/more_fonts/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/more_fonts/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/Module_more_fonts.mk b/more_fonts/Module_more_fonts.mk
new file mode 100644
index 000000000000..7beb2d5abaa5
--- /dev/null
+++ b/more_fonts/Module_more_fonts.mk
@@ -0,0 +1,26 @@
+# -*- 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,more_fonts))
+
+$(eval $(call gb_Module_add_targets,more_fonts,\
+	Package_conf \
+	Package_dejavu \
+	Package_gentium \
+	Package_liberation \
+	Package_liberation_narrow \
+	Package_libertineg \
+	UnpackedTarball_dejavu \
+	UnpackedTarball_gentium \
+	UnpackedTarball_liberation \
+	UnpackedTarball_liberation_narrow \
+	UnpackedTarball_libertineg \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/Package_conf.mk b/more_fonts/Package_conf.mk
new file mode 100644
index 000000000000..d5160bfdf0b5
--- /dev/null
+++ b/more_fonts/Package_conf.mk
@@ -0,0 +1,14 @@
+# -*- 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,more_fonts_inc,$(SRCDIR)/more_fonts/fonts))
+
+$(eval $(call gb_Package_add_file,more_fonts_inc,pck/fc_local.conf,fc_local.conf))
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/Package_dejavu.mk b/more_fonts/Package_dejavu.mk
new file mode 100644
index 000000000000..565442b4c33b
--- /dev/null
+++ b/more_fonts/Package_dejavu.mk
@@ -0,0 +1,41 @@
+# -*- 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/ttf)))
+
+$(eval $(call gb_Package_use_unpacked,font_dejavu_inc,font_dejavu))
+
+$(eval $(call gb_Package_add_files,font_dejavu_inc,pck,\
+	DejaVuSans-Bold.ttf \
+	DejaVuSans-BoldOblique.ttf \
+	DejaVuSans-ExtraLight.ttf \
+	DejaVuSans-Oblique.ttf \
+	DejaVuSans.ttf \
+	DejaVuSansCondensed-Bold.ttf \
+	DejaVuSansCondensed-BoldOblique.ttf \
+	DejaVuSansCondensed-Oblique.ttf \
+	DejaVuSansCondensed.ttf \
+	DejaVuSansMono-Bold.ttf \
+	DejaVuSansMono-BoldOblique.ttf \
+	DejaVuSansMono-Oblique.ttf \
+	DejaVuSansMono.ttf \
+	DejaVuSerif-Bold.ttf \
+	DejaVuSerif-BoldItalic.ttf \
+	DejaVuSerif-Italic.ttf \
+	DejaVuSerif.ttf \
+	DejaVuSerifCondensed-Bold.ttf \
+	DejaVuSerifCondensed-BoldItalic.ttf \
+	DejaVuSerifCondensed-Italic.ttf \
+	DejaVuSerifCondensed.ttf \
+))
+
+
+$(eval $(call gb_Package_Package,font_dejavu_lic,$(call gb_UnpackedTarball_get_dir,font_dejavu/)))
+$(eval $(call gb_Package_use_unpacked,font_dejavu_lic,font_dejavu))
+$(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
new file mode 100644
index 000000000000..2e9093a22db0
--- /dev/null
+++ b/more_fonts/Package_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_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
new file mode 100644
index 000000000000..525736e2dfa7
--- /dev/null
+++ b/more_fonts/Package_liberation.mk
@@ -0,0 +1,31 @@
+# -*- 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
new file mode 100644
index 000000000000..7135589de67d
--- /dev/null
+++ b/more_fonts/Package_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_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
new file mode 100644
index 000000000000..644d29f86734
--- /dev/null
+++ b/more_fonts/Package_libertineg.mk
@@ -0,0 +1,28 @@
+# -*- 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))
+
diff --git a/more_fonts/UnpackedTarball_dejavu.mk b/more_fonts/UnpackedTarball_dejavu.mk
new file mode 100644
index 000000000000..d7742df8c456
--- /dev/null
+++ b/more_fonts/UnpackedTarball_dejavu.mk
@@ -0,0 +1,14 @@
+# -*- 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_UnpackedTarball_UnpackedTarball,font_dejavu))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,font_dejavu,$(FONT_DEJAVU_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/UnpackedTarball_gentium.mk b/more_fonts/UnpackedTarball_gentium.mk
new file mode 100644
index 000000000000..0827c0e23bfb
--- /dev/null
+++ b/more_fonts/UnpackedTarball_gentium.mk
@@ -0,0 +1,14 @@
+# -*- 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_UnpackedTarball_UnpackedTarball,font_gentium))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,font_gentium,$(FONT_GENTIUM_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/UnpackedTarball_liberation.mk b/more_fonts/UnpackedTarball_liberation.mk
new file mode 100644
index 000000000000..8e428f55bc07
--- /dev/null
+++ b/more_fonts/UnpackedTarball_liberation.mk
@@ -0,0 +1,14 @@
+# -*- 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_UnpackedTarball_UnpackedTarball,font_liberation))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,font_liberation,$(FONT_LIBERATION_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/UnpackedTarball_liberation_narrow.mk b/more_fonts/UnpackedTarball_liberation_narrow.mk
new file mode 100644
index 000000000000..52e6f860b8f1
--- /dev/null
+++ b/more_fonts/UnpackedTarball_liberation_narrow.mk
@@ -0,0 +1,14 @@
+# -*- 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_UnpackedTarball_UnpackedTarball,font_liberation_narrow))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,font_liberation_narrow,$(FONT_LIBERATION_NARROW_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/UnpackedTarball_libertineg.mk b/more_fonts/UnpackedTarball_libertineg.mk
new file mode 100644
index 000000000000..51610baa545b
--- /dev/null
+++ b/more_fonts/UnpackedTarball_libertineg.mk
@@ -0,0 +1,15 @@
+# -*- 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_UnpackedTarball_UnpackedTarball,font_libertineg))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,font_libertineg,$(FONT_LINLIBERTINEG_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/more_fonts/prj/build.lst b/more_fonts/prj/build.lst
index 86d08616c28c..af6aa6072b76 100644
--- a/more_fonts/prj/build.lst
+++ b/more_fonts/prj/build.lst
@@ -1,7 +1,2 @@
 bs	more_fonts	:	solenv NULL
-bs	more_fonts\fonts\ttf_dejavu		nmake	-	all	deja_fonts NULL
-bs	more_fonts\fonts\ttf_liberation	nmake	-	all	libe_fonts NULL
-bs	more_fonts\fonts\ttf_liberation_narrow	nmake	-	all	libe_fonts_narrow NULL
-bs	more_fonts\fonts\ttf_gentium	nmake	-	all	gent_fonts NULL
-bs	more_fonts\fonts\ttf_linlibertineg	nmake	-	all	linl_fonts NULL
-bs	more_fonts\fonts\ttf_amt	nmake	-	all	amt_fonts NULL
+bs	more_fonts\prj		nmake	-	all	more_fonts NULL
diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst
index 9d4a90e4164e..e69de29bb2d1 100644
--- a/more_fonts/prj/d.lst
+++ b/more_fonts/prj/d.lst
@@ -1,14 +0,0 @@
-mkdir: %COMMON_DEST%\pck
-..\fonts\fc_local.conf	%COMMON_DEST%\pck\fc_local.conf
-# TODO: replace explicit versions by wildcard when the build system learns to handle them
-..\%__SRC%\misc\build\dejavu-fonts-ttf-2.33\ttf\*.ttf	%COMMON_DEST%\pck\*.ttf
-..\%__SRC%\misc\build\dejavu-fonts-ttf-2.33\LICENSE		%COMMON_DEST%\pck\LICENSE_dejavu
-..\%__SRC%\misc\build\liberation-fonts-ttf-1.07.1/Liberation*Narrow*.ttf	%COMMON_DEST%\pck\*.ttf
-..\%__SRC%\misc\build\liberation-fonts-ttf-1.07.1/License.txt		%COMMON_DEST%\pck\LICENSE_liberation_narrow
-..\%__SRC%\misc\build\liberation-fonts-ttf-2.00.0/Liberation*.ttf	%COMMON_DEST%\pck\*.ttf
-..\%__SRC%\misc\build\liberation-fonts-ttf-2.00.0/License.txt		%COMMON_DEST%\pck\LICENSE_liberation
-..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf		%COMMON_DEST%\pck\*.ttf
-..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt	%COMMON_DEST%\pck\LICENSE_gentium
-..\%__SRC%\misc\build\LinLibertineG\*.ttf		%COMMON_DEST%\pck\*.ttf
-..\%__SRC%\misc\build\LinLibertineG\OFL.txt	%COMMON_DEST%\pck\LICENSE_LinLibertineG
-..\%__SRC%\misc\build\agfa-monotype-fonts\*.ttf	%COMMON_DEST%\pck\*.ttf
diff --git a/more_fonts/prj/dmake b/more_fonts/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/more_fonts/prj/dmake
+++ /dev/null