Merge pull request #182 from davidhewitt/fix-windows-exec

exec: fix for windows

Author: davidhewitt

examples/hello-world/setup.py

@@ -1,11 +1,16 @@
 from setuptools import setup
+
 from setuptools_rust import Binding, RustExtension
 
 setup(
     name="hello-world",
     version="1.0",
     rust_extensions=[
-        RustExtension("hello_world.hello_world", binding=Binding.Exec, script=True)
+        RustExtension(
+            {"hello-world": "hello_world.hello_world"},
+            binding=Binding.Exec,
+            script=True,
+        )
     ],
     # rust extensions are not zip safe, just like C-extensions.
     zip_safe=False,

setuptools_rust/build.py

@@ -14,7 +14,7 @@
 )
 from distutils.sysconfig import get_config_var
 from subprocess import check_output
-from typing import NamedTuple, Optional
+from typing import List, NamedTuple, Optional, Tuple
 
 from setuptools.command.build_ext import get_abi3_suffix
 
@@ -324,31 +324,18 @@ def build_extension(self, ext: RustExtension, target_triple=None):
 
         if executable:
             for name, dest in ext.target.items():
-                if name:
-                    path = os.path.join(artifactsdir, name)
-                    if os.access(path, os.X_OK):
-                        dylib_paths.append((dest, path))
-                        continue
-                    else:
-                        raise DistutilsExecError(
-                            "Rust build failed; "
-                            f"unable to find executable '{name}' in '{target_dir}'"
-                        )
-                else:
-                    # search executable
-                    for name in os.listdir(artifactsdir):
-                        path = os.path.join(artifactsdir, name)
-                        if name.startswith(".") or not os.path.isfile(path):
-                            continue
+                if not name:
+                    name = dest.split(".")[-1]
+                name += sysconfig.get_config_var("EXE")
 
-                        if os.access(path, os.X_OK):
-                            dylib_paths.append((ext.name, path))
-                            break
-
-            if not dylib_paths:
-                raise DistutilsExecError(
-                    f"Rust build failed; unable to find executable in {target_dir}"
-                )
+                path = os.path.join(artifactsdir, name)
+                if os.access(path, os.X_OK):
+                    dylib_paths.append((dest, path))
+                else:
+                    raise DistutilsExecError(
+                        "Rust build failed; "
+                        f"unable to find executable '{name}' in '{artifactsdir}'"
+                    )
         else:
             if sys.platform == "win32" or sys.platform == "cygwin":
                 dylib_ext = "dll"
@@ -372,7 +359,7 @@ def build_extension(self, ext: RustExtension, target_triple=None):
                 )
         return dylib_paths
 
-    def install_extension(self, ext: RustExtension, dylib_paths):
+    def install_extension(self, ext: RustExtension, dylib_paths: List[Tuple[str, str]]):
         executable = ext.binding == Binding.Exec
         debug_build = ext.debug if ext.debug is not None else self.inplace
         debug_build = self.debug if self.debug is not None else debug_build
@@ -383,23 +370,26 @@ def install_extension(self, ext: RustExtension, dylib_paths):
         build_ext = self.get_finalized_command("build_ext")
         build_ext.inplace = self.inplace
 
-        for target_fname, dylib_path in dylib_paths:
-            if not target_fname:
-                target_fname = os.path.basename(
+        for module_name, dylib_path in dylib_paths:
+            if not module_name:
+                module_name = os.path.basename(
                     os.path.splitext(os.path.basename(dylib_path)[3:])[0]
                 )
 
             if executable:
-                ext_path = build_ext.get_ext_fullpath(target_fname)
+                ext_path = build_ext.get_ext_fullpath(module_name)
                 # remove .so extension
                 ext_path, _ = os.path.splitext(ext_path)
                 # remove python3 extension (i.e. cpython-36m)
                 ext_path, _ = os.path.splitext(ext_path)
 
+                # Add expected extension
+                ext_path += sysconfig.get_config_var("EXE")
+
                 os.makedirs(os.path.dirname(ext_path), exist_ok=True)
-                ext.install_script(ext_path)
+                ext.install_script(module_name.split(".")[-1], ext_path)
             else:
-                ext_path = self.get_dylib_ext_path(ext, target_fname)
+                ext_path = self.get_dylib_ext_path(ext, module_name)
                 os.makedirs(os.path.dirname(ext_path), exist_ok=True)
 
             shutil.copyfile(dylib_path, ext_path)

setuptools_rust/extension.py

@@ -180,25 +180,23 @@ def entry_points(self):
 
         return entry_points
 
-    def install_script(self, ext_path):
+    def install_script(self, module_name: str, exe_path: str):
         if self.script and self.binding == Binding.Exec:
-            dirname, name = os.path.split(ext_path)
-            file = os.path.join(dirname, "_gen_%s.py" % name)
+            dirname, executable = os.path.split(exe_path)
+            file = os.path.join(dirname, "_gen_%s.py" % module_name)
             with open(file, "w") as f:
-                f.write(TMPL.format(name=name))
+                f.write(TMPL.format(executable=repr(executable)))
 
 
 TMPL = """
 import os
 import sys
 
-
 def run():
     path = os.path.split(__file__)[0]
-    name = os.path.split(sys.argv[0])[1]
-    file = os.path.join(path, name)
+    file = os.path.join(path, {executable})
     if os.path.isfile(file):
         os.execv(file, sys.argv)
     else:
-        print("can't execute '{name}'")
+        raise RuntimeError("can't find " + file)
 """