minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

[build] Use `info' function of make 3.81. 

* configure, docs/INSTALL, docs/INSTALL.CROSS, docs/INSTALL.GNU,
docs/INSTALL.UNIX, docs/MAKEPP: Bump make version requirements.

* builds/detect.mk (std_setup): Replace `echo' with `info'.
(dos_setup): Removed.
* builds/unix/install.mk, builds/modules.mk, builds/dos/detect.mk,
builds/windows/detect.mk, builds/os2/detect.mk: Updated.
* builds/newline: No longer needed.
This commit is contained in:
Alexei Podtelezhnikov 2018-04-15 16:27:10 -04:00
parent 235b1e2fe6
commit 843193b9d5
14 changed files with 58 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,16 @@
2018-04-15 Alexei Podtelezhnikov <apodtele@gmail.com>
[build] Use `info' function of make 3.81.
* configure, docs/INSTALL, docs/INSTALL.CROSS, docs/INSTALL.GNU,
docs/INSTALL.UNIX, docs/MAKEPP: Bump make version requirements.
* builds/detect.mk (std_setup): Replace `echo' with `info'.
(dos_setup): Removed.
* builds/unix/install.mk, builds/modules.mk, builds/dos/detect.mk,
builds/windows/detect.mk, builds/os2/detect.mk: Updated.
* builds/newline: No longer needed.
2018-04-15 Werner Lemberg <wl@gnu.org> 2018-04-15 Werner Lemberg <wl@gnu.org>
[truetype]: Limit `SLOOP' bytecode argument to 16 bits. [truetype]: Limit `SLOOP' bytecode argument to 16 bits.
@ -33,7 +46,7 @@
2018-04-10 Nikolaus Waxweiler <madigens@gmail.com> 2018-04-10 Nikolaus Waxweiler <madigens@gmail.com>
* CMakeLists.txt, builds/cmake/FindHarfBuzz.cmake: Extensive * CMakeLists.txt, builds/cmake/FindHarfBuzz.cmake: Extensive
modernization measures. modernization measures.
This brings up the minimum required CMake version to 2.8.12. This brings up the minimum required CMake version to 2.8.12.

67
builds/detect.mk
View File

@ -101,57 +101,28 @@ ifndef CONFIG_FILE
.PHONY: setup .PHONY: setup
endif endif
# The following targets are equivalent, with the exception that they use # Flash out and copy rules.
# a slightly different syntax for the `echo' command.
# #
# std_setup: defined for most (i.e. Unix-like) platforms .PHONY: std_setup
# dos_setup: defined for Dos-ish platforms like Dos, Windows & OS/2
#
.PHONY: std_setup dos_setup
std_setup: std_setup:
@echo "" $(info )
@echo "$(PROJECT_TITLE) build system -- automatic system detection" $(info $(PROJECT_TITLE) build system -- automatic system detection)
@echo "" $(info )
@echo "The following settings are used:" $(info The following settings are used:)
@echo "" $(info )
@echo " platform $(PLATFORM)" $(info $(empty) platform $(PLATFORM))
@echo " compiler $(CC)" $(info $(empty) compiler $(CC))
@echo " configuration directory $(BUILD_DIR)" $(info $(empty) configuration directory $(subst /,$(SEP),$(BUILD_DIR)))
@echo " configuration rules $(CONFIG_RULES)" $(info $(empty) configuration rules $(subst /,$(SEP),$(CONFIG_RULES)))
@echo "" $(info )
@echo "If this does not correspond to your system or settings please remove the file" $(info If this does not correspond to your system or settings please remove the file)
@echo "\`$(CONFIG_MK)' from this directory then read the INSTALL file for help." $(info `$(CONFIG_MK)' from this directory then read the INSTALL file for help.)
@echo "" $(info )
@echo "Otherwise, simply type \`$(MAKE)' again to build the library," $(info Otherwise, simply type `$(MAKE)' again to build the library,)
@echo "or \`$(MAKE) refdoc' to build the API reference (this needs python >= 2.6)." $(info or `$(MAKE) refdoc' to build the API reference (this needs python >= 2.6).)
@echo "" $(info )
@$(COPY) $(CONFIG_RULES) $(CONFIG_MK) @$(COPY) $(subst /,$(SEP),$(CONFIG_RULES) $(CONFIG_MK))
# Special case for Dos, Windows, OS/2, where echo "" doesn't work correctly!
#
# For `cmd.exe', we use 0xFF as a replacement character for a protected
# space.
#
dos_setup:
@type builds$(SEP)newline
@echo $(PROJECT_TITLE) build system -- automatic system detection
@type builds$(SEP)newline
@echo The following settings are used:
@type builds$(SEP)newline
@echo platformÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ$(PLATFORM)
@echo compilerÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ$(CC)
@echo configuration directoryÿÿÿÿÿÿ$(subst /,$(SEP),$(BUILD_DIR))
@echo configuration rulesÿÿÿÿÿÿÿÿÿÿ$(subst /,$(SEP),$(CONFIG_RULES))
@type builds$(SEP)newline
@echo If this does not correspond to your system or settings please remove the file
@echo '$(CONFIG_MK)' from this directory then read the INSTALL file for help.
@type builds$(SEP)newline
@echo Otherwise, simply type 'make' again to build the library.
@echo or 'make refdoc' to build the API reference (this needs at least python 2.6).
@type builds$(SEP)newline
@$(COPY) $(subst /,$(SEP),$(CONFIG_RULES) $(CONFIG_MK)) > nul
# EOF # EOF

2
builds/dos/detect.mk
View File

@ -133,7 +133,7 @@ ifeq ($(PLATFORM),dos)
COPY := copy COPY := copy
endif # test NT endif # test NT
setup: dos_setup setup: std_setup
endif endif
endif # test PLATFORM dos endif # test PLATFORM dos

4
builds/modules.mk
View File

@ -41,7 +41,7 @@ endif
define FTMODULE_H_INIT define FTMODULE_H_INIT
$(REMOVE_MODULE) $(REMOVE_MODULE)
@-echo Generating modules list in $(FTMODULE_H)... $(info Generating modules list in $(FTMODULE_H)...)
$(OPEN_MODULE)/* This is a generated file. */$(CLOSE_MODULE) $(OPEN_MODULE)/* This is a generated file. */$(CLOSE_MODULE)
endef endef
@ -56,7 +56,7 @@ endef
define FTMODULE_H_DONE define FTMODULE_H_DONE
$(OPEN_MODULE)/* EOF */$(CLOSE_MODULE) $(OPEN_MODULE)/* EOF */$(CLOSE_MODULE)
@echo done. $(info done.)
endef endef

1
builds/newline
View File

@ -1 +0,0 @@

2
builds/os2/detect.mk
View File

@ -65,7 +65,7 @@ ifeq ($(PLATFORM),os2)
.PHONY: devel .PHONY: devel
endif endif
setup: dos_setup setup: std_setup
endif # test PLATFORM os2 endif # test PLATFORM os2

2
builds/unix/install.mk
View File

@ -84,7 +84,7 @@ uninstall:
check: check:
@echo There is no validation suite for this package. $(info There is no validation suite for this package.)
.PHONY: clean_project_unix distclean_project_unix .PHONY: clean_project_unix distclean_project_unix

24
builds/windows/detect.mk
View File

@ -95,22 +95,22 @@ ifeq ($(PLATFORM),windows)
ifneq ($(findstring list,$(MAKECMDGOALS)),) # test for the "list" target ifneq ($(findstring list,$(MAKECMDGOALS)),) # test for the "list" target
dump_target_list: dump_target_list:
@echo ˙ $(info )
@echo $(PROJECT_TITLE) build system -- supported compilers $(info $(PROJECT_TITLE) build system -- supported compilers)
@echo ˙ $(info )
@echo Several command-line compilers are supported on Win32: $(info Several command-line compilers are supported on Win32:)
@echo ˙ $(info )
@echo ˙˙make setup˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙gcc (with Mingw) $(info $(empty) make setup gcc (with Mingw))
@echo ˙˙make setup visualc˙˙˙˙˙˙˙˙˙˙˙˙˙Microsoft Visual C++ $(info $(empty) make setup visualc Microsoft Visual C++)
@echo ˙˙make setup bcc32˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙Borland C/C++ $(info $(empty) make setup bcc32 Borland C/C++)
@echo ˙˙make setup lcc˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙Win32-LCC $(info $(empty) make setup lcc Win32-LCC)
@echo ˙˙make setup intelc˙˙˙˙˙˙˙˙˙˙˙˙˙˙Intel C/C++ $(info $(empty) make setup intelc Intel C/C++)
@echo ˙ $(info )
setup: dump_target_list setup: dump_target_list
.PHONY: dump_target_list list .PHONY: dump_target_list list
else else
setup: dos_setup setup: std_setup
endif endif
# additionally, we provide hooks for various other compilers # additionally, we provide hooks for various other compilers

2
configure vendored
View File

@ -29,7 +29,7 @@ else
fi fi
if test "x`$MAKE -v 2>/dev/null | egrep 'GNU|makepp'`" = x; then if test "x`$MAKE -v 2>/dev/null | egrep 'GNU|makepp'`" = x; then
echo "GNU make (>= 3.80) or makepp (>= 1.19) is required to build FreeType2." >&2 echo "GNU make (>= 3.81) or makepp (>= 2.0) is required to build FreeType2." >&2
echo "Please try" >&2 echo "Please try" >&2
echo >&2 echo >&2
echo " MAKE=<GNU make command name> $0" >&2 echo " MAKE=<GNU make command name> $0" >&2

4
docs/INSTALL
View File

@ -14,7 +14,7 @@ I. Normal installation and upgrades
compilation, since other make tools won't work (this includes BSD compilation, since other make tools won't work (this includes BSD
Make). Make).
GNU Make VERSION 3.80 OR NEWER IS NEEDED! GNU Make VERSION 3.81 OR NEWER IS NEEDED!
[For `cmake' see below.] [For `cmake' see below.]
@ -72,7 +72,7 @@ II. Custom builds of the library
http://makepp.sourceforge.net http://makepp.sourceforge.net
for more information; you need version 1.19 or newer, and you must for more information; you need version 2.0 or newer, and you must
pass option `--norc-substitution'. pass option `--norc-substitution'.
---------------------------------------------------------------------- ----------------------------------------------------------------------

2
docs/INSTALL.CROSS
View File

@ -9,7 +9,7 @@ procedure.
----------------- -----------------
For self-building the FreeType library on a Unix system, GNU Make For self-building the FreeType library on a Unix system, GNU Make
3.80 or newer is required. `INSTALL.UNIX' contains hints how to 3.81 or newer is required. `INSTALL.UNIX' contains hints how to
check the installed `make'. check the installed `make'.
The GNU C compiler to cross-build the target system is required. The GNU C compiler to cross-build the target system is required.

4
docs/INSTALL.GNU
View File

@ -25,7 +25,7 @@ instructions in the file `INSTALL.UNIX' instead.
http://makepp.sourceforge.net http://makepp.sourceforge.net
for more information; you need version 1.19 or newer, and you must for more information; you need version 2.0 or newer, and you must
pass option `--norc-substitution'. pass option `--norc-substitution'.
Make sure that you are invoking GNU Make from the command line, by Make sure that you are invoking GNU Make from the command line, by
@ -35,7 +35,7 @@ instructions in the file `INSTALL.UNIX' instead.
to display its version number. to display its version number.
VERSION 3.80 OR NEWER IS NEEDED! VERSION 3.81 OR NEWER IS NEEDED!
2. Invoke `make' 2. Invoke `make'

2
docs/INSTALL.UNIX
View File

@ -19,7 +19,7 @@ or MSys on Win32:
GNU Make <version number> GNU Make <version number>
Copyright (C) <year> Free Software Foundation Inc. Copyright (C) <year> Free Software Foundation Inc.
Note that version 3.80 or higher is *required* or the build will Note that version 3.81 or higher is *required* or the build will
fail. fail.
It is also fine to have GNU Make under another name (e.g. 'gmake') It is also fine to have GNU Make under another name (e.g. 'gmake')

2
docs/MAKEPP
View File

@ -1,5 +1,5 @@
As a special exception, FreeType can also be built with the 'makepp' As a special exception, FreeType can also be built with the 'makepp'
build tool, available from http://makepp.sourceforge.net. build tool, available from http://makepp.sourceforge.net.
Note, however. that you will need at least version 1.19 and pass the Note, however, that you will need at least version 2.0 and pass the
option --norc-substitution to have it work correctly. option --norc-substitution to have it work correctly.