[1948] 2009-01-17 Felix Zielcke <[email protected]>

Revision: 1948
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1948
Author:   fzielcke
Date:     2009-01-17 09:38:38 +0000 (Sat, 17 Jan 2009)

Log Message:
-----------
2009-01-17  Felix Zielcke  <[email protected]>

	* Makefile.in: Change font compilation to use new grub-mkfont instead
	of java version.

	* util/fonttool/src/org/gnu/grub/fonttool/BDFLoader.java: Remove.
	* util/fonttool/src/org/gnu/grub/fonttool/CharDefs.java: Likewise.
	* util/fonttool/src/org/gnu/grub/fonttool/CharacterRange.java: Likewise.
	* util/fonttool/src/org/gnu/grub/fonttool/CharacterRange.java: Likewise.
	* util/fonttool/src/org/gnu/grub/fonttool/Converter.java: Likewise.
	* util/fonttool/src/org/gnu/grub/fonttool/Font.java: Likewise.
	* util/fonttool/src/org/gnu/grub/fonttool/Glyph.java: Likewise.
	* util/fonttool/src/org/gnu/grub/fonttool/PFF2Sections.java: Likewise.
	* util/fonttool/src/org/gnu/grub/fonttool/PFF2Writer.java: Likewise.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/Makefile.in

Removed Paths:
-------------
    trunk/grub2/util/fonttool/

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2009-01-16 19:29:41 UTC (rev 1947)
+++ trunk/grub2/ChangeLog	2009-01-17 09:38:38 UTC (rev 1948)
@@ -1,3 +1,18 @@
+2009-01-17  Felix Zielcke  <[email protected]>
+
+	* Makefile.in: Change font compilation to use new grub-mkfont instead
+	of java version.
+
+	* util/fonttool/src/org/gnu/grub/fonttool/BDFLoader.java: Remove.
+	* util/fonttool/src/org/gnu/grub/fonttool/CharDefs.java: Likewise.
+	* util/fonttool/src/org/gnu/grub/fonttool/CharacterRange.java: Likewise.
+	* util/fonttool/src/org/gnu/grub/fonttool/CharacterRange.java: Likewise.
+	* util/fonttool/src/org/gnu/grub/fonttool/Converter.java: Likewise.
+	* util/fonttool/src/org/gnu/grub/fonttool/Font.java: Likewise.
+	* util/fonttool/src/org/gnu/grub/fonttool/Glyph.java: Likewise.
+	* util/fonttool/src/org/gnu/grub/fonttool/PFF2Sections.java: Likewise.
+	* util/fonttool/src/org/gnu/grub/fonttool/PFF2Writer.java: Likewise.
+
 2009-01-16  Christian Franke  <[email protected]>
 
 	* disk/ata.c (enum grub_ata_commands): Remove EXEC_DEV_DIAGNOSTICS.

Modified: trunk/grub2/Makefile.in
===================================================================
--- trunk/grub2/Makefile.in	2009-01-16 19:29:41 UTC (rev 1947)
+++ trunk/grub2/Makefile.in	2009-01-17 09:38:38 UTC (rev 1948)
@@ -153,25 +153,22 @@
 
 ifeq (, $(UNIFONT_BDF))
 else
+
+ifeq ($(enable_grub_mkfont),yes)
+
 pkgdata_DATA += unicode.pf2 ascii.pf2
 
 # Arrows and lines are needed to draw the menu, so we always include them
 UNICODE_ARROWS=0x2190-0x2193
 UNICODE_LINES=0x2501-0x251B
 
-# Note: fonttool should be replaced with C only implementation
+unicode.pf2: $(UNIFONT_BDF) grub-mkfont
+	$(builddir)/grub-mkfont -o $@ $(UNIFONT_BDF)
 
-$(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'`
-	jar cf $(builddir)/fonttool/fonttool.jar -C $(builddir)/fonttool/src .
-
-unicode.pf2: $(UNIFONT_BDF) $(builddir)/fonttool/fonttool.jar
-	java -cp $(builddir)/fonttool/fonttool.jar org.gnu.grub.fonttool.Converter --in=$(UNIFONT_BDF) --out=$@
-
-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)
+ascii.pf2: $(UNIFONT_BDF) grub-mkfont
+	$(builddir)/grub-mkfont -o $@ $(UNIFONT_BDF) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES)
 endif
+endif
 
 # Used for building modules externally
 pkglib_BUILDDIR += build_env.mk