Merge branch 'develop' of https://github.com/pythonnet/pythonnet into pythonnet-develop

tonyroberts · tonyroberts · commit aad52dc782be · 2015-06-25T14:40:40.000+01:00
Conflicts:
	setup.py
diff --git a/setup.py b/setup.py
@@ -4,22 +4,19 @@
 """
 from setuptools import setup, Extension
 from distutils.command.build_ext import build_ext
-from distutils.command.build_scripts import build_scripts
 from distutils.command.install_lib import install_lib
+from distutils.command.install_data import install_data
 from distutils.sysconfig import get_config_var
-from distutils.util import convert_path
-from distutils.dep_util import newer
-from distutils import log
 from platform import architecture
 from subprocess import Popen, CalledProcessError, PIPE, check_call
 from glob import glob
-import stat
+import fnmatch
 import sys
 import os
 
-CONFIG = "Release" # Release or Debug
+CONFIG = "Release"  # Release or Debug
 DEVTOOLS = "MsDev" if sys.platform == "win32" else "Mono"
-VERBOSITY = "minimal" # quiet, minimal, normal, detailed, diagnostic
+VERBOSITY = "minimal"  # quiet, minimal, normal, detailed, diagnostic
 PLATFORM = "x64" if architecture()[0] == "64bit" else "x86"
 
 
@@ -167,7 +164,6 @@ def build_extension(self, ext):
         if DEVTOOLS == "Mono":
             self._build_monoclr(ext)
 
-
     def _get_manifest(self, build_dir):
         if DEVTOOLS == "MsDev" and sys.version_info[:2] > (2,5):
             mt = _find_msbuild_tool("mt.exe", use_windows_sdk=True)
@@ -177,7 +173,6 @@ def _get_manifest(self, build_dir):
             check_call(" ".join(cmd), shell=False)
             return manifest
 
-
     def _build_monoclr(self, ext):
         mono_libs = _check_output("pkg-config --libs mono-2", shell=True)
         mono_cflags = _check_output("pkg-config --cflags mono-2", shell=True)
@@ -197,7 +192,6 @@ def _build_monoclr(self, ext):
 
         build_ext.build_extension(self, clr_ext)
 
-
     def _install_packages(self):
         """install packages using nuget"""
         nuget = os.path.join("tools", "nuget", "nuget.exe")
@@ -222,12 +216,31 @@ def install(self):
         if not os.path.exists(self.install_dir):
             self.mkpath(self.install_dir)
 
-        # only copy clr.pyd and its dependencies
-        for pattern in ("clr.*", "Python.Runtime.*"):
-            for srcfile in glob(os.path.join(self.build_dir, pattern)):
-                destfile = os.path.join(self.install_dir, os.path.basename(srcfile))
-                self.copy_file(srcfile, destfile)
-    
+        # only copy clr.pyd/.so
+        for srcfile in glob(os.path.join(self.build_dir, "clr.*")):
+            destfile = os.path.join(self.install_dir, os.path.basename(srcfile))
+            self.copy_file(srcfile, destfile)
+
+
+class PythonNET_InstallData(install_data):
+
+    def run(self):
+        build_cmd = self.get_finalized_command("build_ext")
+        install_cmd = self.get_finalized_command("install")
+        build_lib = os.path.abspath(build_cmd.build_lib)
+        install_platlib = os.path.relpath(install_cmd.install_platlib, self.install_dir)
+
+        for i, data_files in enumerate(self.data_files):
+            if isinstance(data_files, str):
+                self.data_files[i] = data_files[i].format(build_lib=build_lib)
+            else:
+                for j, filename in enumerate(data_files[1]):
+                    data_files[1][j] = filename.format(build_lib=build_lib)
+                dest = data_files[0].format(install_platlib=install_platlib)
+                self.data_files[i] = dest, data_files[1]
+
+        return install_data.run(self)
+
 
 def _check_output(*popenargs, **kwargs):
     """subprocess.check_output from python 2.7.
@@ -248,6 +261,24 @@ def _check_output(*popenargs, **kwargs):
 
 
 if __name__ == "__main__":
+    setupdir = os.path.dirname(__file__)
+    if setupdir:
+        os.chdir(setupdir)
+
+    sources = []
+    for ext in (".sln", ".snk", ".config"):
+        sources.extend(glob("*" + ext))
+
+    for root, dirnames, filenames in os.walk("src"):
+        for ext in (".cs", ".csproj", ".sln", ".snk", ".config", ".il", ".py", ".c", ".h", ".ico"):
+            for filename in fnmatch.filter(filenames, "*" + ext):
+                sources.append(os.path.join(root, filename))
+
+    for root, dirnames, filenames in os.walk("tools"):
+        for ext in (".exe"):
+            for filename in fnmatch.filter(filenames, "*" + ext):
+                sources.append(os.path.join(root, filename))
+
     setup(
         name="pythonnet",
         version="2.0.0.dev1",
@@ -258,12 +289,18 @@ def _check_output(*popenargs, **kwargs):
             'Development Status :: 3 - Alpha',
             'Intended Audience :: Developers'],
         ext_modules=[
-            Extension("clr", sources=[])
+            Extension("clr", sources=sources)
+        ],
+        data_files=[
+            ("{install_platlib}", [
+                "{build_lib}/Python.Runtime.dll",
+                "Python.Runtime.dll.config"]),
         ],
         zip_safe=False,
         cmdclass={
-            "build_ext": PythonNET_BuildExt,
-            "install_lib": PythonNET_InstallLib,
+            "build_ext" : PythonNET_BuildExt,
+            "install_lib" : PythonNET_InstallLib,
+            "install_data": PythonNET_InstallData,
         }
     )
 
