From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1LNkyY-0001Z5-SW for mharc-grub-devel@gnu.org; Fri, 16 Jan 2009 04:26:50 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LNkyX-0001XK-2b for grub-devel@gnu.org; Fri, 16 Jan 2009 04:26:49 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LNkyV-0001Up-3b for grub-devel@gnu.org; Fri, 16 Jan 2009 04:26:48 -0500 Received: from [199.232.76.173] (port=49275 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LNkyU-0001Um-Tf for grub-devel@gnu.org; Fri, 16 Jan 2009 04:26:46 -0500 Received: from moutng.kundenserver.de ([212.227.17.8]:65352) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LNkyU-0001Yb-05 for grub-devel@gnu.org; Fri, 16 Jan 2009 04:26:46 -0500 Received: from [85.180.34.34] (e180034034.adsl.alicedsl.de [85.180.34.34]) by mrelayeu.kundenserver.de (node=mrelayeu2) with ESMTP (Nemesis) id 0MKwtQ-1LNkyG1rAM-00055w; Fri, 16 Jan 2009 10:26:34 +0100 From: Felix Zielcke To: The development of GRUB 2 Content-Type: multipart/mixed; boundary="=-SF9CP/LWFqlWrBJlZI5s" Date: Fri, 16 Jan 2009 10:26:29 +0100 Message-Id: <1232097989.3372.0.camel@fz.local> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 X-Provags-ID: V01U2FsdGVkX18gfkAqOG1TOPjlgy4DZLE0zqeKn6sLK9cyjT5 k/rGccwxSfChWwbHe4NkDJFNcjdp3LGHxOCjxZWNHCYdVPfdL6 LAoRGZVNJmomhuxNrStHE3NmteJMEjw X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [PATCH] use grub-mkfont to create ascii.pf2 and unicode.pf2 if it's avaible X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jan 2009 09:26:49 -0000 --=-SF9CP/LWFqlWrBJlZI5s Content-Type: text/plain Content-Transfer-Encoding: 7bit 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? -- Felix Zielcke --=-SF9CP/LWFqlWrBJlZI5s Content-Disposition: attachment; filename=grub-mkfont.diff Content-Type: text/x-patch; name=grub-mkfont.diff; charset=UTF-8 Content-Transfer-Encoding: 7bit 2009-01-16 Felix Zielcke Makefile.in: Use grub-mkfont to create ascii.pf2 and unicode.pf2 if it's avaible. Index: Makefile.in =================================================================== --- Makefile.in (revision 1946) +++ Makefile.in (working copy) @@ -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 --=-SF9CP/LWFqlWrBJlZI5s--