ENH: copy files into wheel from install directory

Author: dnicolodi

mesonpy/__init__.py

@@ -436,11 +436,6 @@ def _install_path(
                 if platform.system() == 'Linux' or platform.system() == 'Darwin':
                     # add .mesonpy.libs to the RPATH of ELF files
                     if self._is_native(os.fspath(origin)):
-                        # copy ELF to our working directory to avoid Meson having to regenerate the file
-                        new_origin = self._libs_build_dir / pathlib.Path(origin).relative_to(self._build_dir)
-                        os.makedirs(new_origin.parent, exist_ok=True)
-                        shutil.copy2(origin, new_origin)
-                        origin = new_origin
                         # add our in-wheel libs folder to the RPATH
                         if platform.system() == 'Linux':
                             elf = mesonpy._elf.ELF(origin)
@@ -476,30 +471,41 @@ def _wheel_write_metadata(self, whl: mesonpy._wheelfile.WheelFile) -> None:
             )
 
     def build(self, directory: Path) -> pathlib.Path:
-        self._project.build()  # ensure project is built
+        # ensure project is built
+        self._project.build()
 
-        wheel_file = pathlib.Path(directory, f'{self.name}.whl')
-        with mesonpy._wheelfile.WheelFile(wheel_file, 'w') as whl:
-            self._wheel_write_metadata(whl)
+        with tempfile.TemporaryDirectory() as destdir:
+            # install project in temporary destination directory
+            installed = self._project.install(destdir)
 
-            print('{light_blue}{bold}Copying files to wheel...{reset}'.format(**_STYLES))
-            with mesonpy._util.cli_counter(sum(len(x) for x in self._wheel_files.values())) as counter:
+            wheel_file = pathlib.Path(directory, f'{self.name}.whl')
+            with mesonpy._wheelfile.WheelFile(wheel_file, 'w') as whl:
+                self._wheel_write_metadata(whl)
 
-                root = 'purelib' if self.is_pure else 'platlib'
+                print('{light_blue}{bold}Copying files to wheel...{reset}'.format(**_STYLES))
+                with mesonpy._util.cli_counter(sum(len(x) for x in self._wheel_files.values())) as counter:
 
-                for path, entries in self._wheel_files.items():
-                    for dst, src in entries:
-                        counter.update(src)
+                    root = 'purelib' if self.is_pure else 'platlib'
 
-                        if path == root:
-                            pass
-                        elif path == 'mesonpy-libs':
-                            # custom installation path for bundled libraries
-                            dst = pathlib.Path(f'.{self._project.name}.mesonpy.libs', dst)
-                        else:
-                            dst = pathlib.Path(self.data_dir, path, dst)
+                    for path, entries in self._wheel_files.items():
+                        for dst, src in entries:
+                            counter.update(src)
+
+                            # Install files from installation path into the wheel. This guarantees
+                            # that the installed files had the build path rpath removed by Meson
+                            # during 'meson install' and that directories installed with
+                            # 'install_subdir()' had 'excluded_files' and 'excluded_directories'
+                            # omitted.
+                            src = installed[os.fspath(src)]
+
+                            if path == root:
+                                pass
+                            elif path == 'mesonpy-libs':
+                                dst = pathlib.Path(f'.{self._project.name}.mesonpy.libs', dst)
+                            else:
+                                dst = pathlib.Path(self.data_dir, path, dst)
 
-                        self._install_path(whl, src, dst)
+                            self._install_path(whl, src, dst)
 
         return wheel_file
 

tests/test_project.py

@@ -76,7 +76,7 @@ def last_two_meson_args():
         'dist-args': ('cli-dist',),
         'setup-args': ('cli-setup',),
         'compile-args': ('cli-compile',),
-        'install-args': ('cli-install',), # 'meson install' is not called thus we cannot test this
+        'install-args': ('cli-install',)
     }
 
     mesonpy.build_sdist(tmp_path, config_settings)
@@ -86,9 +86,10 @@ def last_two_meson_args():
         # sdist: calls to 'meson setup' and 'meson dist'
         ('config-setup', 'cli-setup'),
         ('config-dist', 'cli-dist'),
-        # wheel: calls to 'meson setup' and 'ninja'
+        # wheel: calls to 'meson setup', 'ninja', and 'meson install'
         ('config-setup', 'cli-setup'),
         ('config-compile', 'cli-compile'),
+        ('config-install', 'cli-install'),
     ]