* builds/toplevel.mk (dist): Extract version number from freetype.h.

This commit is contained in:
Werner Lemberg 2006-12-09 08:20:37 +00:00
parent 15c29503fb
commit 4e1d6c0c51
5 changed files with 30 additions and 15 deletions

View File

@ -1,3 +1,7 @@
2006-12-08 Werner Lemberg <wl@gnu.org>
* builds/toplevel.mk (dist): Extract version number from freetype.h.
2006-12-08 Vladimir Volovich <vvv@vsu.ru> 2006-12-08 Vladimir Volovich <vvv@vsu.ru>
* src/tools/apinames (State): Remove final comma in structure -- xlc * src/tools/apinames (State): Remove final comma in structure -- xlc

View File

@ -2758,7 +2758,7 @@
Add vertical phantom points. Add vertical phantom points.
* include/freetype/internal/tttypes.h (TT_LoaderRec): Add * include/freetype/internal/tttypes.h (TT_LoaderRec): Add
`top_bearing', `vadvance', `pp3, and `pp4'. `top_bearing', `vadvance', `pp3', and `pp4'.
* src/autofit/afloader.c (af_loader_load_g): Handle two more points. * src/autofit/afloader.c (af_loader_load_g): Handle two more points.

View File

@ -163,11 +163,22 @@ include $(TOP_DIR)/builds/modules.mk
# Not to be run by a normal user -- there are no attempts to make it # Not to be run by a normal user -- there are no attempts to make it
# generic. # generic.
ifneq ($(findstring dist,$(MAKECMDGOALS)),)
FT_H := include/freetype/freetype.h
major := $(shell sed -n 's/.*FREETYPE_MAJOR.*\([0-9]\+\)/\1/p' < $(FT_H))
minor := $(shell sed -n 's/.*FREETYPE_MINOR.*\([0-9]\+\)/\1/p' < $(FT_H))
patch := $(shell sed -n 's/.*FREETYPE_PATCH.*\([0-9]\+\)/\1/p' < $(FT_H))
version := $(major).$(minor).$(patch)
winversion := $(major)$(minor)$(patch)
endif
dist: dist:
-rm -rf tmp -rm -rf tmp
rm -f freetype-2.2.1.tar.gz rm -f freetype-$(version).tar.gz
rm -f freetype-2.2.1.tar.bz2 rm -f freetype-$(version).tar.bz2
rm -f ft221.zip rm -f ft$(winversion).zip
for d in `find . -wholename '*/CVS' -prune \ for d in `find . -wholename '*/CVS' -prune \
-o -type f \ -o -type f \
@ -194,17 +205,17 @@ dist:
chmod +w src/tools/docmaker chmod +w src/tools/docmaker
mv tmp freetype-2.2.1 mv tmp freetype-$(version)
tar cfh - freetype-2.2.1 \ tar cfh - freetype-$(version) \
| gzip -c > freetype-2.2.1.tar.gz | gzip -c > freetype-$(version).tar.gz
tar cfh - freetype-2.2.1 \ tar cfh - freetype-$(version) \
| bzip2 -c > freetype-2.2.1.tar.bz2 | bzip2 -c > freetype-$(version).tar.bz2
@# Use CR/LF for zip files. @# Use CR/LF for zip files.
zip -lr ft221.zip freetype-2.2.1 zip -lr ft$(winversion).zip freetype-$(version)
rm -fr freetype-2.2.1 rm -fr freetype-$(version)
# The locations of the latest `config.guess' and `config.sub' versions (from # The locations of the latest `config.guess' and `config.sub' versions (from

View File

@ -414,7 +414,7 @@ FT_BEGIN_HEADER
/* */ /* */
/* Useful to optimize access to memory-based streams transparently. */ /* Useful to optimize access to memory-based streams transparently. */
/* */ /* */
/* All extracted frames must be `freed` with a call to the function */ /* All extracted frames must be `freed' with a call to the function */
/* FT_Stream_ReleaseFrame(). */ /* FT_Stream_ReleaseFrame(). */
/* */ /* */
FT_BASE( FT_Error ) FT_BASE( FT_Error )

View File

@ -13,11 +13,11 @@ Glyph images are loaded into memory only on demand, thus leading to a small
memory footprint. memory footprint.
Informations on the PCF font format can only be worked out from Informations on the PCF font format can only be worked out from
``pcfread.c'', and ``pcfwrite.c'', to be found, for instance, in the XFree86 `pcfread.c', and `pcfwrite.c', to be found, for instance, in the XFree86
(www.xfree86.org) source tree (xc/lib/font/bitmap/). (www.xfree86.org) source tree (xc/lib/font/bitmap/).
Many good bitmap fonts in bdf format come with XFree86: they can be Many good bitmap fonts in bdf format come with XFree86: they can be
compiled into the pcf format using the ``bdftopcf'' utility. compiled into the pcf format using the `bdftopcf' utility.
Supported hardware Supported hardware
@ -50,7 +50,7 @@ client application the work of interpreting them. For instance:
if ((pcfface->charset_registry == "ISO10646") && if ((pcfface->charset_registry == "ISO10646") &&
(pcfface->charset_encoding) == "1")) [..] (pcfface->charset_encoding) == "1")) [..]
Thus the driver always export ``ft_encoding_none'' as Thus the driver always export `ft_encoding_none' as
face->charmap.encoding. FT_Get_Char_Index() behavior is unmodified, that face->charmap.encoding. FT_Get_Char_Index() behavior is unmodified, that
is, it converts the ULong value given as argument into the corresponding is, it converts the ULong value given as argument into the corresponding
glyph number. glyph number.