[pytango] 18/122: Refactor platform specific code in setup file (Issue #51, PR #52)

[Sandor Bodo-Merle]

This is an automated email from the git hooks/post-receive script.

sbodomerle-guest pushed a commit to tag v9.2.1
in repository pytango.

commit ac4bb7ac6cbdc8615902aed51a040a50a3227399
Author: Vincent Michel <vxgmichel at gmail.com>
Date:   Fri Sep 9 10:34:33 2016 +0200

    Refactor platform specific code in setup file (Issue #51, PR #52)
---
 setup.py | 50 ++++++++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/setup.py b/setup.py
index 096885a..4f9d128 100644
--- a/setup.py
+++ b/setup.py
@@ -25,6 +25,7 @@ from distutils.command.build import build as dftbuild
 from distutils.unixccompiler import UnixCCompiler
 from distutils.version import StrictVersion as V
 
+# Sphinx imports
 try:
     import sphinx
     import sphinx.util.console
@@ -33,12 +34,24 @@ try:
 except ImportError:
     sphinx = None
 
+# Detect numpy
 try:
     import numpy
 except ImportError:
     numpy = None
 
-is64 = 8 * struct.calcsize("P") == 64
+# Platform constants
+POSIX = 'posix' in os.name
+WINDOWS = 'nt' in os.name
+IS64 = 8 * struct.calcsize("P") == 64
+PYTHON_VERSION = platform.python_version_tuple()
+
+# Linux distribution
+distribution = platform.linux_distribution()[0].lower() if POSIX else ""
+distribution_match = lambda names: any(x in distribution for x in names)
+DEBIAN = distribution_match(['debian', 'ubuntu', 'mint'])
+REDHAT = distribution_match(['redhat', 'fedora', 'centos'])
+GENTOO = distribution_match(['gentoo'])
 
 
 def pkg_config(*packages, **config):
@@ -126,7 +139,7 @@ def add_lib(name, dirs, sys_libs,
             dirs['include_dirs'].append(inc_dir)
 
         lib_dirs = [os.path.join(ENV, 'lib')]
-        if is64:
+        if IS64:
             lib64_dir = os.path.join(ENV, 'lib64')
             if os.path.isdir(lib64_dir):
                 lib_dirs.insert(0, lib64_dir)
@@ -174,7 +187,7 @@ class build(dftbuild):
             self.strip_debug_symbols()
 
     def strip_debug_symbols(self):
-        if 'posix' not in os.name:
+        if not POSIX:
             return
         if os.system("type objcopy") != 0:
             return
@@ -324,7 +337,7 @@ def setup_args():
     sys_libs = []
 
     # Link specifically to libtango version 9
-    tangolib = ':libtango.so.9' if 'linux' in sys.platform else 'tango'
+    tangolib = ':libtango.so.9' if POSIX else 'tango'
     directories['libraries'].append(tangolib)
 
     add_lib('omni', directories, sys_libs, lib_name='omniORB4')
@@ -336,26 +349,19 @@ def setup_args():
     BOOST_ROOT = os.environ.get('BOOST_ROOT')
     boost_library_name = 'boost_python'
     if BOOST_ROOT is None:
-        if 'linux' in sys.platform:
-            dist_name = platform.linux_distribution()[0].lower()
-            debian_based = 'debian' in dist_name or 'ubuntu' in dist_name or \
-                           'mint' in dist_name
-            py_ver = platform.python_version_tuple()
-            if debian_based:
-                # when building with  multiple version of python  on debian we
-                # need to link against boost_python-py25/-py26 etc...
-                pyver = "-py"
-                pyver += "".join(map(str, py_ver[:2]))
-                boost_library_name += pyver
-            elif 'gentoo' in dist_name:
-                boost_library_name += "-" + ".".join(map(str, py_ver[:2]))
-            elif 'fedora' in dist_name or 'centos' in dist_name:
-                if int(py_ver[0]) == 3:
-                    boost_library_name += '3'
+        if DEBIAN:
+            suffix = "-py{v[0]}{v[1]}".format(v=PYTHON_VERSION)
+            boost_library_name += suffix
+        elif REDHAT:
+            if PYTHON_VERSION >= (3,):
+                boost_library_name += '3'
+        elif GENTOO:
+            suffix = "-{v[0]}.{v[1]}".format(v=PYTHON_VERSION)
+            boost_library_name += suffix
     else:
         inc_dir = os.path.join(BOOST_ROOT, 'include')
         lib_dirs = [os.path.join(BOOST_ROOT, 'lib')]
-        if is64:
+        if IS64:
             lib64_dir = os.path.join(BOOST_ROOT, 'lib64')
             if os.path.isdir(lib64_dir):
                 lib_dirs.insert(0, lib64_dir)
@@ -377,7 +383,7 @@ def setup_args():
     else:
         macros.append(('PYTANGO_NUMPY_VERSION', '"%s"' % numpy.__version__))
 
-    if 'posix' in os.name:
+    if POSIX:
         directories = pkg_config(*sys_libs, **directories)
 
     Release = get_release_info()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git