[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 843193b: [build] Use `info' function of make 3.81.
From: |
Alexei Podtelezhnikov |
Subject: |
[freetype2] master 843193b: [build] Use `info' function of make 3.81. |
Date: |
Sun, 15 Apr 2018 16:27:52 -0400 (EDT) |
branch: master
commit 843193b9d51a6c1acbf48b580160220e90110561
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>
[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.
---
ChangeLog | 15 ++++++++++-
builds/detect.mk | 67 ++++++++++++++----------------------------------
builds/dos/detect.mk | 2 +-
builds/modules.mk | 4 +--
builds/newline | 1 -
builds/os2/detect.mk | 2 +-
builds/unix/install.mk | 2 +-
builds/windows/detect.mk | 24 ++++++++---------
configure | 2 +-
docs/INSTALL | 4 +--
docs/INSTALL.CROSS | 2 +-
docs/INSTALL.GNU | 4 +--
docs/INSTALL.UNIX | 2 +-
docs/MAKEPP | 2 +-
14 files changed, 58 insertions(+), 75 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2f6bffc..0197dcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2018-04-15 Alexei Podtelezhnikov <address@hidden>
+
+ [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 <address@hidden>
[truetype]: Limit `SLOOP' bytecode argument to 16 bits.
@@ -33,7 +46,7 @@
2018-04-10 Nikolaus Waxweiler <address@hidden>
- * CMakeLists.txt, builds/cmake/FindHarfBuzz.cmake: Extensive
+ * CMakeLists.txt, builds/cmake/FindHarfBuzz.cmake: Extensive
modernization measures.
This brings up the minimum required CMake version to 2.8.12.
diff --git a/builds/detect.mk b/builds/detect.mk
index 771fc31..eb7f797 100644
--- a/builds/detect.mk
+++ b/builds/detect.mk
@@ -101,57 +101,28 @@ ifndef CONFIG_FILE
.PHONY: setup
endif
-# The following targets are equivalent, with the exception that they use
-# a slightly different syntax for the `echo' command.
+# Flash out and copy rules.
#
-# std_setup: defined for most (i.e. Unix-like) platforms
-# dos_setup: defined for Dos-ish platforms like Dos, Windows & OS/2
-#
-.PHONY: std_setup dos_setup
+.PHONY: std_setup
std_setup:
- @echo ""
- @echo "$(PROJECT_TITLE) build system -- automatic system detection"
- @echo ""
- @echo "The following settings are used:"
- @echo ""
- @echo " platform $(PLATFORM)"
- @echo " compiler $(CC)"
- @echo " configuration directory $(BUILD_DIR)"
- @echo " configuration rules $(CONFIG_RULES)"
- @echo ""
- @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."
- @echo ""
- @echo "Otherwise, simply type \`$(MAKE)' again to build the library,"
- @echo "or \`$(MAKE) refdoc' to build the API reference (this needs
python >= 2.6)."
- @echo ""
- @$(COPY) $(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
+ $(info )
+ $(info $(PROJECT_TITLE) build system -- automatic system detection)
+ $(info )
+ $(info The following settings are used:)
+ $(info )
+ $(info $(empty) platform $(PLATFORM))
+ $(info $(empty) compiler $(CC))
+ $(info $(empty) configuration directory $(subst
/,$(SEP),$(BUILD_DIR)))
+ $(info $(empty) configuration rules $(subst
/,$(SEP),$(CONFIG_RULES)))
+ $(info )
+ $(info If this does not correspond to your system or settings please
remove the file)
+ $(info `$(CONFIG_MK)' from this directory then read the INSTALL file
for help.)
+ $(info )
+ $(info Otherwise, simply type `$(MAKE)' again to build the library,)
+ $(info or `$(MAKE) refdoc' to build the API reference (this needs
python >= 2.6).)
+ $(info )
+ @$(COPY) $(subst /,$(SEP),$(CONFIG_RULES) $(CONFIG_MK))
# EOF
diff --git a/builds/dos/detect.mk b/builds/dos/detect.mk
index 55b0e76..0201f7b 100644
--- a/builds/dos/detect.mk
+++ b/builds/dos/detect.mk
@@ -133,7 +133,7 @@ ifeq ($(PLATFORM),dos)
COPY := copy
endif # test NT
- setup: dos_setup
+ setup: std_setup
endif
endif # test PLATFORM dos
diff --git a/builds/modules.mk b/builds/modules.mk
index e1edb17..9a7a4a0 100644
--- a/builds/modules.mk
+++ b/builds/modules.mk
@@ -41,7 +41,7 @@ endif
define FTMODULE_H_INIT
$(REMOVE_MODULE)
address@hidden Generating modules list in $(FTMODULE_H)...
+$(info Generating modules list in $(FTMODULE_H)...)
$(OPEN_MODULE)/* This is a generated file. */$(CLOSE_MODULE)
endef
@@ -56,7 +56,7 @@ endef
define FTMODULE_H_DONE
$(OPEN_MODULE)/* EOF */$(CLOSE_MODULE)
address@hidden done.
+$(info done.)
endef
diff --git a/builds/newline b/builds/newline
deleted file mode 100644
index 8b13789..0000000
--- a/builds/newline
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/builds/os2/detect.mk b/builds/os2/detect.mk
index 2edb8d4..aaf7848 100644
--- a/builds/os2/detect.mk
+++ b/builds/os2/detect.mk
@@ -65,7 +65,7 @@ ifeq ($(PLATFORM),os2)
.PHONY: devel
endif
- setup: dos_setup
+ setup: std_setup
endif # test PLATFORM os2
diff --git a/builds/unix/install.mk b/builds/unix/install.mk
index 8942451..c08c3b7 100644
--- a/builds/unix/install.mk
+++ b/builds/unix/install.mk
@@ -84,7 +84,7 @@ uninstall:
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
diff --git a/builds/windows/detect.mk b/builds/windows/detect.mk
index b047e02..dd5669c 100644
--- a/builds/windows/detect.mk
+++ b/builds/windows/detect.mk
@@ -95,22 +95,22 @@ ifeq ($(PLATFORM),windows)
ifneq ($(findstring list,$(MAKECMDGOALS)),) # test for the "list" target
dump_target_list:
- @echo �
- @echo $(PROJECT_TITLE) build system -- supported compilers
- @echo �
- @echo Several command-line compilers are supported on Win32:
- @echo �
- @echo ��make setup���������������������gcc (with Mingw)
- @echo ��make setup visualc�������������Microsoft Visual C++
- @echo ��make setup bcc32���������������Borland C/C++
- @echo ��make setup lcc�����������������Win32-LCC
- @echo ��make setup intelc��������������Intel C/C++
- @echo �
+ $(info )
+ $(info $(PROJECT_TITLE) build system -- supported compilers)
+ $(info )
+ $(info Several command-line compilers are supported on Win32:)
+ $(info )
+ $(info $(empty) make setup gcc (with Mingw))
+ $(info $(empty) make setup visualc Microsoft Visual
C++)
+ $(info $(empty) make setup bcc32 Borland C/C++)
+ $(info $(empty) make setup lcc Win32-LCC)
+ $(info $(empty) make setup intelc Intel C/C++)
+ $(info )
setup: dump_target_list
.PHONY: dump_target_list list
else
- setup: dos_setup
+ setup: std_setup
endif
# additionally, we provide hooks for various other compilers
diff --git a/configure b/configure
index 8ee0d40..f9d2186 100755
--- a/configure
+++ b/configure
@@ -29,7 +29,7 @@ else
fi
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 >&2
echo " MAKE=<GNU make command name> $0" >&2
diff --git a/docs/INSTALL b/docs/INSTALL
index fc24ea1..71d4a05 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -14,7 +14,7 @@ I. Normal installation and upgrades
compilation, since other make tools won't work (this includes BSD
Make).
- GNU Make VERSION 3.80 OR NEWER IS NEEDED!
+ GNU Make VERSION 3.81 OR NEWER IS NEEDED!
[For `cmake' see below.]
@@ -72,7 +72,7 @@ II. Custom builds of the library
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'.
----------------------------------------------------------------------
diff --git a/docs/INSTALL.CROSS b/docs/INSTALL.CROSS
index e8977a1..239e1a9 100644
--- a/docs/INSTALL.CROSS
+++ b/docs/INSTALL.CROSS
@@ -9,7 +9,7 @@ procedure.
-----------------
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'.
The GNU C compiler to cross-build the target system is required.
diff --git a/docs/INSTALL.GNU b/docs/INSTALL.GNU
index 52645f1..e314ecf 100644
--- a/docs/INSTALL.GNU
+++ b/docs/INSTALL.GNU
@@ -25,7 +25,7 @@ instructions in the file `INSTALL.UNIX' instead.
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'.
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.
- VERSION 3.80 OR NEWER IS NEEDED!
+ VERSION 3.81 OR NEWER IS NEEDED!
2. Invoke `make'
diff --git a/docs/INSTALL.UNIX b/docs/INSTALL.UNIX
index bb57836..f92d828 100644
--- a/docs/INSTALL.UNIX
+++ b/docs/INSTALL.UNIX
@@ -19,7 +19,7 @@ or MSys on Win32:
GNU Make <version number>
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.
It is also fine to have GNU Make under another name (e.g. 'gmake')
diff --git a/docs/MAKEPP b/docs/MAKEPP
index 58eaf55..a4d44b7 100644
--- a/docs/MAKEPP
+++ b/docs/MAKEPP
@@ -1,5 +1,5 @@
As a special exception, FreeType can also be built with the 'makepp'
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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 843193b: [build] Use `info' function of make 3.81.,
Alexei Podtelezhnikov <=