Skip to contentSkip to conversation

use grub-mkfont to create ascii.pf2 and unicode.pf2 if it's avaible

PATCH In review Felix Zielcke 2 participants 3 messages Jan 16, 2009 – Jan 17, 2009 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 use grub-mkfont to create ascii.pf2 and unicode.pf2 if it's avaible

Here's a little patch for Makefile.in to use the new grub-mkfont to create the font files.
Is it okay or is there a better way to do this?

Signature · 1 line
Felix Zielcke

2009-01-16 Felix Zielcke <[email protected]>

Makefile.in: Use grub-mkfont to create ascii.pf2 and unicode.pf2 if it's avaible.

Makefile.in +8 -2
Index: Makefile.in
===================================================================
@@ -159,8 +159,13 @@ pkgdata_DATA += unicode.pf2 ascii.pf2
 UNICODE_ARROWS=0x2190-0x2193
 UNICODE_LINES=0x2501-0x251B
 
-# Note: fonttool should be replaced with C only implementation
-
+ifeq ($(enable_grub_mkfont),yes)
+unicode.pf2: $(UNIFONT_BDF) grub-mkfont
+	$(builddir)/grub-mkfont -o $@ $(UNIFONT_BDF)
+
+ascii.pf2: $(UNIFONT_BDF) grub-mkfont
+	$(builddir)/grub-mkfont -o $@ $(UNIFONT_BDF) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES)
+else
 $(builddir)/fonttool/fonttool.jar: 
 	mkdir -p "$(builddir)/fonttool/src"
 	javac -source 1.5 -target 1.5 -g -deprecation -encoding UTF-8 -d "$(builddir)/fonttool/src" `find "$(srcdir)/util/fonttool/src/" -name '*.java'`
@@ -172,6 +177,7 @@ unicode.pf2: $(UNIFONT_BDF) $(builddir)/
 ascii.pf2: $(UNIFONT_BDF) $(builddir)/fonttool/fonttool.jar
 	java -cp $(builddir)/fonttool/fonttool.jar org.gnu.grub.fonttool.Converter --in=$(UNIFONT_BDF) --out=$@ 0x0-0x7f $(UNICODE_ARROWS) $(UNICODE_LINES)
 endif
+endif
 
 # Used for building modules externally
 pkglib_BUILDDIR += build_env.mk
#1 lore raw
Quoted 3 lines · Felix Zielcke

Here's a little patch for Makefile.in to use the new grub-mkfont to create the font files.
Is it okay or is there a better way to do this?

Please remove the java code & toolchain with the same change.

#2 lore raw

Am Freitag, den 16.01.2009, 17:32 +0200 schrieb Vesa Jääskeläinen:

Quoted 6 lines
Quoted 3 lines · Felix Zielcke

Here's a little patch for Makefile.in to use the new grub-mkfont to create the font files.
Is it okay or is there a better way to do this?

Please remove the java code & toolchain with the same change.

Ok commited.

Signature · 1 line
Felix Zielcke