diff options
| author | Werner Lemberg <wl@gnu.org> | 2019-03-15 07:27:02 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2019-03-15 07:56:49 +0100 |
| commit | fbbcf50367403a6316a013b51690071198962920 (patch) | |
| tree | 25a3e55ed188631e172d10d1c76f9a355e5b7e6e /builds/toplevel.mk | |
| parent | 4e64d9d3daa6356da8ad30b8303402f7dd4a30d2 (diff) | |
| download | freetype2-fbbcf50367403a6316a013b51690071198962920.tar.gz | |
* Version 2.10.0 released.VER-2-10-0
==========================
Tag sources with `VER-2-10-0'.
* docs/VERSION.TXT: Add entry for version 2.10.0.
* docs/CHANGES: Updated.
* README, Jamfile (RefDoc), src/base/ftver.rc,
builds/windows/vc2010/freetype.vcxproj,
builds/windows/vc2010/index.html,
builds/windows/visualc/freetype.dsp,
builds/windows/visualc/freetype.vcproj,
builds/windows/visualc/index.html,
builds/windows/visualce/freetype.dsp,
builds/windows/visualce/freetype.vcproj,
builds/windows/visualce/index.html,
builds/wince/vc2005-ce/freetype.vcproj,
builds/wince/vc2005-ce/index.html,
builds/wince/vc2008-ce/freetype.vcproj,
builds/wince/vc2008-ce/index.html: s/2.9.1/2.10.0/, s/291/2100/.
* include/freetype/freetype.h (FREETYPE_MINOR): Set to 10.
(FREETYPE_PATCH): Set to 0.
* builds/unix/configure.raw (version_info): Set to 23:0:17.
* CMakeLists.txt (VERSION_MINOR): Set to 10.
(VERSION_PATCH): Set to 0.
* builds/toplevel.mk (version, winversion): Since the minor version
number has two digits now, never omit the patch number. We would
get ambiguous zip file names otherwise.
(dist): Remove remnants of `docmaker' tool.
(do-dist): Remove unused intermediate files.
* src/cff/cffparse.c (destrict_c2s_item): Guard function with
CFF_CONFIG_OPTION_OLD_ENGINE macro.
Diffstat (limited to 'builds/toplevel.mk')
| -rw-r--r-- | builds/toplevel.mk | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/builds/toplevel.mk b/builds/toplevel.mk index f9a5b5bf8..24fa7fad2 100644 --- a/builds/toplevel.mk +++ b/builds/toplevel.mk @@ -191,13 +191,13 @@ work := $(word 2,$(work)) patch := $(subst |,$(space),$(work)) patch := $(firstword $(patch)) -ifneq ($(findstring x0x,x$(patch)x),) - version := $(major).$(minor) - winversion := $(major)$(minor) -else +# ifneq ($(findstring x0x,x$(patch)x),) +# version := $(major).$(minor) +# winversion := $(major)$(minor) +# else version := $(major).$(minor).$(patch) winversion := $(major)$(minor)$(patch) -endif +# endif # This target builds the tarballs. @@ -226,17 +226,10 @@ dist: ln -s $$currdir/$$f tmp/$$f ; \ done - @# Prevent generation of .pyc files. Python follows (soft) links if - @# the link's directory is write protected, so we have temporarily - @# disable write access here too. - chmod -w src/tools/docmaker - cd tmp ; \ $(MAKE) devel ; \ $(MAKE) do-dist - chmod +w src/tools/docmaker - mv tmp freetype-$(version) tar -H ustar -chf - freetype-$(version) \ @@ -274,4 +267,8 @@ do-dist: distclean refdoc cp $(CONFIG_GUESS) builds/unix cp $(CONFIG_SUB) builds/unix + @# Remove intermediate files created by the `refdoc' target. + rm -rf docs/reference/markdown + rm -f docs/reference/mkdocs.yml + # EOF |