From 19dfcbd2a4bad475862c85c3765481c997626811 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Tue, 6 Oct 2009 12:00:43 +0200 Subject: [PATCH] * Version 2.3.10 released. ========================== Tag sources with `VER-2-3-10'. * builds/toplevel.mk (major, minor, patch): Fix regexp to allow more than a single digit. (dist): We now use git. * docs/VERSION.DLL: Update documentation and bump version number to 2.3.10. * README, Jamfile (RefDoc), builds/win32/visualc/index.html, builds/win32/visualc/freetype.dsp, builds/win32/visualc/freetype.vcproj, builds/win32/visualce/index.html, builds/win32/visualce/freetype.dsp, builds/win32/visualce/freetype.vcproj: s/2.3.9/2.3.10/, s/239/2310/. * include/freetype/freetype.h (FREETYPE_PATCH): Set to 10. * builds/unix/configure.raw (version_info): Set to 9:21:3. --- ChangeLog | 26 ++++++++ Jamfile | 2 +- README | 10 +-- builds/toplevel.mk | 10 +-- builds/unix/configure.raw | 2 +- builds/unix/mkinstalldirs | 0 builds/win32/vc2005/freetype.vcproj | 12 ++-- builds/win32/vc2005/index.html | 10 +-- builds/win32/vc2008/freetype.vcproj | 12 ++-- builds/win32/vc2008/index.html | 10 +-- builds/win32/visualc/freetype.dsp | 20 +++--- builds/win32/visualc/index.html | 10 +-- builds/win32/visualce/freetype.dsp | 20 +++--- builds/win32/visualce/freetype.vcproj | 84 +++++++++++++------------- builds/win32/visualce/index.html | 10 +-- builds/wince/vc2005-ce/freetype.vcproj | 76 +++++++++++------------ builds/wince/vc2005-ce/index.html | 10 +-- builds/wince/vc2008-ce/freetype.vcproj | 76 +++++++++++------------ builds/wince/vc2008-ce/index.html | 10 +-- configure | 0 docs/VERSION.DLL | 1 + include/freetype/freetype.h | 2 +- 22 files changed, 220 insertions(+), 193 deletions(-) mode change 100644 => 100755 builds/unix/mkinstalldirs mode change 100644 => 100755 configure diff --git a/ChangeLog b/ChangeLog index ee8b76b6a..3363b90c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +2009-10-06 Werner Lemberg + + * Version 2.3.10 released. + ========================== + + + Tag sources with `VER-2-3-10'. + + * builds/toplevel.mk (major, minor, patch): Fix regexp to allow more + than a single digit. + (dist): We now use git. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.3.10. + + * README, Jamfile (RefDoc), builds/win32/visualc/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj, + builds/win32/visualce/index.html, + builds/win32/visualce/freetype.dsp, + builds/win32/visualce/freetype.vcproj: s/2.3.9/2.3.10/, s/239/2310/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 10. + + * builds/unix/configure.raw (version_info): Set to 9:21:3. + 2009-10-06 Werner Lemberg Fix `make multi'. diff --git a/Jamfile b/Jamfile index e5273d80b..d51929e43 100644 --- a/Jamfile +++ b/Jamfile @@ -194,7 +194,7 @@ rule RefDoc actions RefDoc { - python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.3.9 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h + python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.3.10 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h } RefDoc refdoc ; diff --git a/README b/README index 6e5ad46b1..dfe2a7d8b 100644 --- a/README +++ b/README @@ -9,8 +9,8 @@ is called `libttf'. They are *not* compatible! - FreeType 2.3.9 - ============== + FreeType 2.3.10 + =============== Please read the docs/CHANGES file, it contains IMPORTANT INFORMATION. @@ -26,9 +26,9 @@ and download one of the following files. - freetype-doc-2.3.9.tar.bz2 - freetype-doc-2.3.9.tar.gz - ftdoc239.zip + freetype-doc-2.3.10.tar.bz2 + freetype-doc-2.3.10.tar.gz + ftdoc2310.zip Bugs diff --git a/builds/toplevel.mk b/builds/toplevel.mk index e6a8e932f..6a8280173 100644 --- a/builds/toplevel.mk +++ b/builds/toplevel.mk @@ -177,9 +177,9 @@ include $(TOP_DIR)/builds/modules.mk ifneq ($(findstring distx,$(MAKECMDGOALS)x),) 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)) + major := $(shell sed -n 's/.*FREETYPE_MAJOR[^0-9]*\([0-9]\+\)/\1/p' < $(FT_H)) + minor := $(shell sed -n 's/.*FREETYPE_MINOR[^0-9]*\([0-9]\+\)/\1/p' < $(FT_H)) + patch := $(shell sed -n 's/.*FREETYPE_PATCH[^0-9]*\([0-9]\+\)/\1/p' < $(FT_H)) version := $(major).$(minor).$(patch) winversion := $(major)$(minor)$(patch) @@ -191,14 +191,14 @@ dist: rm -f freetype-$(version).tar.bz2 rm -f ft$(winversion).zip - for d in `find . -wholename '*/CVS' -prune \ + for d in `find . -wholename '*/.git' -prune \ -o -type f \ -o -print` ; do \ mkdir -p tmp/$$d ; \ done ; currdir=`pwd` ; \ - for f in `find . -wholename '*/CVS' -prune \ + for f in `find . -wholename '*/.git' -prune \ -o -name .cvsignore \ -o -type d \ -o -print` ; do \ diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index cbb82f40e..bed639b28 100644 --- a/builds/unix/configure.raw +++ b/builds/unix/configure.raw @@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in]) # Don't forget to update docs/VERSION.DLL! -version_info='9:20:3' +version_info='9:21:3' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) diff --git a/builds/unix/mkinstalldirs b/builds/unix/mkinstalldirs old mode 100644 new mode 100755 diff --git a/builds/win32/vc2005/freetype.vcproj b/builds/win32/vc2005/freetype.vcproj index dca7cfb3a..79c434cd1 100644 --- a/builds/win32/vc2005/freetype.vcproj +++ b/builds/win32/vc2005/freetype.vcproj @@ -16,7 +16,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -101,7 +101,7 @@ - + diff --git a/builds/win32/vc2005/index.html b/builds/win32/vc2005/index.html index 41d5e0a0a..6494a1b4f 100644 --- a/builds/win32/vc2005/index.html +++ b/builds/win32/vc2005/index.html @@ -11,14 +11,14 @@

This directory contains project files for Visual C++, named freetype.vcproj, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.3.9 sources:

+compiles the following libraries from the FreeType 2.3.10 sources:

    -    freetype239.lib     - release build; single threaded
-    freetype239_D.lib   - debug build;   single threaded
-    freetype239MT.lib   - release build; multi-threaded
-    freetype239MT_D.lib - debug build;   multi-threaded
    + freetype2310.lib - release build; single threaded + freetype2310_D.lib - debug build; single threaded + freetype2310MT.lib - release build; multi-threaded + freetype2310MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/win32/vc2008/freetype.vcproj b/builds/win32/vc2008/freetype.vcproj index f3681932c..62d5ae515 100644 --- a/builds/win32/vc2008/freetype.vcproj +++ b/builds/win32/vc2008/freetype.vcproj @@ -70,7 +70,7 @@ /> This directory contains project files for Visual C++, named freetype.vcproj, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.3.9 sources:

+compiles the following libraries from the FreeType 2.3.10 sources:

    -    freetype239.lib     - release build; single threaded
-    freetype239_D.lib   - debug build;   single threaded
-    freetype239MT.lib   - release build; multi-threaded
-    freetype239MT_D.lib - debug build;   multi-threaded
    + freetype2310.lib - release build; single threaded + freetype2310_D.lib - debug build; single threaded + freetype2310MT.lib - release build; multi-threaded + freetype2310MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/win32/visualc/freetype.dsp b/builds/win32/visualc/freetype.dsp index 12f277d5f..739a3580f 100644 --- a/builds/win32/visualc/freetype.dsp +++ b/builds/win32/visualc/freetype.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype239.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2310.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug" @@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype239_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2310_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" @@ -102,8 +102,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype239_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype239MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype2310_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2310MT_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" @@ -126,8 +126,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype239.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype239MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype2310.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2310MT.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded" @@ -151,8 +151,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype239.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype239ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2310.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype2310ST.lib" # SUBTRACT LIB32 /nologo !ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded" @@ -177,8 +177,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype239_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype239ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2310_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2310ST_D.lib" !ENDIF diff --git a/builds/win32/visualc/index.html b/builds/win32/visualc/index.html index fffcf4fde..7d052bb8f 100644 --- a/builds/win32/visualc/index.html +++ b/builds/win32/visualc/index.html @@ -11,14 +11,14 @@

This directory contains project files for Visual C++, named freetype.dsp, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.3.9 sources:

+compiles the following libraries from the FreeType 2.3.10 sources:

    -    freetype239.lib     - release build; single threaded
-    freetype239_D.lib   - debug build;   single threaded
-    freetype239MT.lib   - release build; multi-threaded
-    freetype239MT_D.lib - debug build;   multi-threaded
    + freetype2310.lib - release build; single threaded + freetype2310_D.lib - debug build; single threaded + freetype2310MT.lib - release build; multi-threaded + freetype2310MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/win32/visualce/freetype.dsp b/builds/win32/visualce/freetype.dsp index 520c5f62f..739a3580f 100644 --- a/builds/win32/visualce/freetype.dsp +++ b/builds/win32/visualce/freetype.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype238.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2310.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug" @@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype238_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2310_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" @@ -102,8 +102,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype238_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype238MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype2310_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2310MT_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" @@ -126,8 +126,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype238.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype238MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype2310.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2310MT.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded" @@ -151,8 +151,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype238.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype238ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2310.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype2310ST.lib" # SUBTRACT LIB32 /nologo !ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded" @@ -177,8 +177,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype238_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype238ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2310_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2310ST_D.lib" !ENDIF diff --git a/builds/win32/visualce/freetype.vcproj b/builds/win32/visualce/freetype.vcproj index 9a044d6c9..6178c1c6d 100644 --- a/builds/win32/visualce/freetype.vcproj +++ b/builds/win32/visualce/freetype.vcproj @@ -87,7 +87,7 @@ /> PPC/SP WM6 (Windows Mobile 6) -It compiles the following libraries from the FreeType 2.3.8 sources:

+It compiles the following libraries from the FreeType 2.3.10 sources:

    -    freetype238.lib     - release build; single threaded
-    freetype238_D.lib   - debug build;   single threaded
-    freetype238MT.lib   - release build; multi-threaded
-    freetype238MT_D.lib - debug build;   multi-threaded
    + freetype2310.lib - release build; single threaded + freetype2310_D.lib - debug build; single threaded + freetype2310MT.lib - release build; multi-threaded + freetype2310MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/wince/vc2005-ce/freetype.vcproj b/builds/wince/vc2005-ce/freetype.vcproj index b539f6f4a..0ff0baadc 100644 --- a/builds/wince/vc2005-ce/freetype.vcproj +++ b/builds/wince/vc2005-ce/freetype.vcproj @@ -21,7 +21,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -201,7 +201,7 @@ - + @@ -221,7 +221,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -281,7 +281,7 @@ - + @@ -301,7 +301,7 @@ - + @@ -321,7 +321,7 @@ - + @@ -341,7 +341,7 @@ - + @@ -361,7 +361,7 @@ - + @@ -381,7 +381,7 @@ - + @@ -401,7 +401,7 @@ - + @@ -421,7 +421,7 @@ - + @@ -441,7 +441,7 @@ - + @@ -461,7 +461,7 @@ - + @@ -481,7 +481,7 @@ - + @@ -501,7 +501,7 @@ - + @@ -521,7 +521,7 @@ - + @@ -541,7 +541,7 @@ - + @@ -561,7 +561,7 @@ - + @@ -581,7 +581,7 @@ - + @@ -601,7 +601,7 @@ - + @@ -621,7 +621,7 @@ - + @@ -641,7 +641,7 @@ - + @@ -661,7 +661,7 @@ - + @@ -681,7 +681,7 @@ - + @@ -701,7 +701,7 @@ - + @@ -721,7 +721,7 @@ - + @@ -741,7 +741,7 @@ - + @@ -758,7 +758,7 @@ - + diff --git a/builds/wince/vc2005-ce/index.html b/builds/wince/vc2005-ce/index.html index 780ce41a4..a8aebf774 100644 --- a/builds/wince/vc2005-ce/index.html +++ b/builds/wince/vc2005-ce/index.html @@ -21,14 +21,14 @@ the following targets:

  • PPC/SP WM6 (Windows Mobile 6)
    • -It compiles the following libraries from the FreeType 2.3.9 sources:

    +It compiles the following libraries from the FreeType 2.3.10 sources:

      -    freetype239.lib     - release build; single threaded
-    freetype239_D.lib   - debug build;   single threaded
-    freetype239MT.lib   - release build; multi-threaded
-    freetype239MT_D.lib - debug build;   multi-threaded
      + freetype2310.lib - release build; single threaded + freetype2310_D.lib - debug build; single threaded + freetype2310MT.lib - release build; multi-threaded + freetype2310MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/wince/vc2008-ce/freetype.vcproj b/builds/wince/vc2008-ce/freetype.vcproj index 5e38b368a..09e70bd7c 100644 --- a/builds/wince/vc2008-ce/freetype.vcproj +++ b/builds/wince/vc2008-ce/freetype.vcproj @@ -88,7 +88,7 @@ /> PPC/SP WM6 (Windows Mobile 6) -It compiles the following libraries from the FreeType 2.3.9 sources:

    +It compiles the following libraries from the FreeType 2.3.10 sources:

      -    freetype239.lib     - release build; single threaded
-    freetype239_D.lib   - debug build;   single threaded
-    freetype239MT.lib   - release build; multi-threaded
-    freetype239MT_D.lib - debug build;   multi-threaded
      + freetype2310.lib - release build; single threaded + freetype2310_D.lib - debug build; single threaded + freetype2310MT.lib - release build; multi-threaded + freetype2310MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/configure b/configure old mode 100644 new mode 100755 diff --git a/docs/VERSION.DLL b/docs/VERSION.DLL index 6b028b12f..f1e7a5a58 100644 --- a/docs/VERSION.DLL +++ b/docs/VERSION.DLL @@ -53,6 +53,7 @@ systems, but not all of them: release libtool so ------------------------------- + 2.3.10 9.21.3 6.3.21 2.3.9 9.20.3 6.3.20 2.3.8 9.19.3 6.3.19 2.3.7 9.18.3 6.3.18 diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index 2e6f6b087..135a87936 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -3763,7 +3763,7 @@ FT_BEGIN_HEADER */ #define FREETYPE_MAJOR 2 #define FREETYPE_MINOR 3 -#define FREETYPE_PATCH 9 +#define FREETYPE_PATCH 10 /*************************************************************************/