Merge pull request #13067 from anntzer/missing-freetype-libpng

QuLogic · web-flow · commit 5c7d2feb68cd · 2019-05-28T22:41:53.000-04:00
Simplify generation of error messages for missing libpng/freetype.
diff --git a/setup.py b/setup.py
@@ -210,10 +210,6 @@ def run(self):
             print_line()
             print_message("The following required packages can not be built: "
                           "%s" % ", ".join(x.name for x in required_failed))
-            for pkg in required_failed:
-                msg = pkg.install_help_msg()
-                if msg:
-                    print_message(msg)
             sys.exit(1)
 
         # Now collect all of the information we need to build all of the
diff --git a/setupext.py b/setupext.py
@@ -291,14 +291,6 @@ class CheckFailed(Exception):
 
 class SetupPackage(object):
     optional = False
-    pkg_names = {
-        "apt-get": None,
-        "yum": None,
-        "dnf": None,
-        "brew": None,
-        "port": None,
-        "windows_url": None
-        }
 
     def check(self):
         """
@@ -333,56 +325,6 @@ def do_custom_build(self):
         """
         pass
 
-    def install_help_msg(self):
-        """
-        Do not override this method !
-
-        Generate the help message to show if the package is not installed.
-        To use this in subclasses, simply add the dictionary `pkg_names` as
-        a class variable:
-
-        pkg_names = {
-            "apt-get": <Name of the apt-get package>,
-            "yum": <Name of the yum package>,
-            "dnf": <Name of the dnf package>,
-            "brew": <Name of the brew package>,
-            "port": <Name of the port package>,
-            "windows_url": <The url which has installation instructions>
-            }
-
-        All the dictionary keys are optional. If a key is not present or has
-        the value `None` no message is provided for that platform.
-        """
-        def _try_managers(*managers):
-            for manager in managers:
-                pkg_name = self.pkg_names.get(manager, None)
-                if pkg_name:
-                    if shutil.which(manager) is not None:
-                        if manager == 'port':
-                            pkgconfig = 'pkgconfig'
-                        else:
-                            pkgconfig = 'pkg-config'
-                        return ('Try installing {0} with `{1} install {2}` '
-                                'and pkg-config with `{1} install {3}`'
-                                .format(self.name, manager, pkg_name,
-                                        pkgconfig))
-
-        message = None
-        if sys.platform == "win32":
-            url = self.pkg_names.get("windows_url", None)
-            if url:
-                message = ('Please check {0} for instructions to install {1}'
-                           .format(url, self.name))
-        elif sys.platform == "darwin":
-            message = _try_managers("brew", "port")
-        elif sys.platform == "linux":
-            release = platform.linux_distribution()[0].lower()
-            if release in ('debian', 'ubuntu'):
-                message = _try_managers('apt-get')
-            elif release in ('centos', 'redhat', 'fedora'):
-                message = _try_managers('dnf', 'yum')
-        return message
-
 
 class OptionalPackage(SetupPackage):
     optional = True
@@ -552,14 +494,6 @@ def add_flags(self, ext, add_sources=True):
 
 class FreeType(SetupPackage):
     name = "freetype"
-    pkg_names = {
-        "apt-get": "libfreetype6-dev",
-        "yum": "freetype-devel",
-        "dnf": "freetype-devel",
-        "brew": "freetype",
-        "port": "freetype",
-        "windows_url": "http://gnuwin32.sourceforge.net/packages/freetype.htm"
-        }
 
     def add_flags(self, ext):
         ext.sources.insert(0, 'src/checkdep_freetype2.c')
@@ -708,14 +642,6 @@ def get_extension(self):
 
 class Png(SetupPackage):
     name = "png"
-    pkg_names = {
-        "apt-get": "libpng12-dev",
-        "yum": "libpng-devel",
-        "dnf": "libpng-devel",
-        "brew": "libpng",
-        "port": "libpng",
-        "windows_url": "http://gnuwin32.sourceforge.net/packages/libpng.htm"
-        }
 
     def get_extension(self):
         sources = [
diff --git a/src/checkdep_freetype2.c b/src/checkdep_freetype2.c
@@ -1,13 +1,23 @@
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#define XSTR(x) STR(x)
-#define STR(x) #x
-
-#pragma message("Compiling with FreeType version " \
-  XSTR(FREETYPE_MAJOR) "." XSTR(FREETYPE_MINOR) "." XSTR(FREETYPE_PATCH) ".")
-#if FREETYPE_MAJOR << 16 + FREETYPE_MINOR << 8 + FREETYPE_PATCH < 0x020300
-    #error "FreeType version 2.3 or higher is required." \
-      "Consider setting the MPLLOCALFREETYPE environment variable to 1."
-  #error
+#if defined __has_include && ! __has_include(<ft2build.h>)
+
+  #error "FreeType version 2.3 or higher is required. \
+You may set the MPLLOCALFREETYPE environment variable to 1 to let \
+Matplotlib download it."
+
+#else
+
+  #include <ft2build.h>
+  #include FT_FREETYPE_H
+
+  #define XSTR(x) STR(x)
+  #define STR(x) #x
+
+  #pragma message("Compiling with FreeType version " \
+    XSTR(FREETYPE_MAJOR) "." XSTR(FREETYPE_MINOR) "." XSTR(FREETYPE_PATCH) ".")
+  #if FREETYPE_MAJOR << 16 + FREETYPE_MINOR << 8 + FREETYPE_PATCH < 0x020300
+    #error "FreeType version 2.3 or higher is required. \
+You may set the MPLLOCALFREETYPE environment variable to 1 to let \
+Matplotlib download it."
+  #endif
+
 #endif
diff --git a/src/checkdep_libpng.c b/src/checkdep_libpng.c
@@ -1,5 +1,19 @@
-#include <png.h>
-#pragma message("Compiling with libpng version " PNG_LIBPNG_VER_STRING ".")
-#if PNG_LIBPNG_VER < 10200
-  #error "libpng version 1.2 or higher is required."
+#if defined __has_include && ! __has_include(<png.h>)
+
+  #error "libpng version 1.2 or higher is required. \
+Consider installing it with e.g. 'conda install libpng', \
+'apt install libpng12-dev', 'dnf install libpng-devel', or \
+'brew install libpng'."
+
+#else
+
+  #include <png.h>
+  #pragma message("Compiling with libpng version " PNG_LIBPNG_VER_STRING ".")
+  #if PNG_LIBPNG_VER < 10200
+    #error "libpng version 1.2 or higher is required. \
+Consider installing it with e.g. 'conda install libpng', \
+'apt install libpng12-dev', 'dnf install libpng-devel', or \
+'brew install libpng'."
+  #endif
+
 #endif
