Change location of Python.Runtime.dll in wheel.

tonyroberts · tonyroberts · commit 77c598bc46eb · 2015-06-25T11:08:56.000+01:00
Install Python.Runtime.dll into the same folder as
the clr module, rather than the platform specific
data folder.
diff --git a/setup.py b/setup.py
@@ -241,17 +241,17 @@ class PythonNET_InstallData(install_data):
 
     def run(self):
         build_cmd = self.get_finalized_command("build_ext")
-        install_lib_cmd = self.get_finalized_command("install_lib")
-        build_dir = os.path.abspath(build_cmd.build_lib)
-        install_dir = os.path.abspath(install_lib_cmd.install_dir)
+        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].replace("BUILD_DIR", build_dir)
+                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.replace("BUILD_DIR", build_dir)
-                dest = data_files[0].replace("INSTALL_DIR", install_dir)
+                    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)
@@ -324,7 +324,7 @@ def _check_output(*popenargs, **kwargs):
             Extension("clr", sources=sources)
         ],
         data_files=[
-            ("INSTALL_DIR", ["BUILD_DIR/Python.Runtime.dll"]),
+            ("{install_platlib}", ["{build_lib}/Python.Runtime.dll"]),
         ],
         scripts=[_npython_exe],
         zip_safe=False,
