fix: install bundled binaries into platlib

Author: BayernMuller

cppllvm_build.py

@@ -15,6 +15,7 @@
 
 from setuptools.command.bdist_wheel import bdist_wheel as _bdist_wheel
 from setuptools.command.build_py import build_py as _build_py
+from setuptools.command.install import install as _install
 from setuptools.errors import SetupError
 
 if sys.version_info >= (3, 11):
@@ -249,12 +250,17 @@ def stage_payload(config: PackageBuildConfig, build_lib: Path) -> None:
 
 def make_build_commands(
     config: PackageBuildConfig,
-) -> tuple[type[_build_py], type[_bdist_wheel]]:
+) -> tuple[type[_build_py], type[_bdist_wheel], type[_install]]:
     class build_py(_build_py):
         def run(self) -> None:
             super().run()
             stage_payload(config, Path(self.build_lib))
 
+    class install(_install):
+        def finalize_options(self) -> None:
+            super().finalize_options()
+            self.install_lib = self.install_platlib
+
     class bdist_wheel(_bdist_wheel):
         def finalize_options(self) -> None:
             super().finalize_options()
@@ -264,4 +270,4 @@ def get_tag(self) -> tuple[str, str, str]:
             _, _, platform_tag = super().get_tag()
             return "py3", "none", platform_tag
 
-    return build_py, bdist_wheel
+    return build_py, bdist_wheel, install

packages/cformat/build_hooks.py

@@ -17,7 +17,7 @@
 sys.modules[MODULE_SPEC.name] = BUILD_HELPERS
 MODULE_SPEC.loader.exec_module(BUILD_HELPERS)
 
-build_py, bdist_wheel = BUILD_HELPERS.make_build_commands(
+build_py, bdist_wheel, install = BUILD_HELPERS.make_build_commands(
     BUILD_HELPERS.PackageBuildConfig(
         package_dir=ROOT,
         package_name="cformat",

packages/cformat/cppllvm_build.py

@@ -15,6 +15,7 @@
 
 from setuptools.command.bdist_wheel import bdist_wheel as _bdist_wheel
 from setuptools.command.build_py import build_py as _build_py
+from setuptools.command.install import install as _install
 from setuptools.errors import SetupError
 
 if sys.version_info >= (3, 11):
@@ -249,12 +250,17 @@ def stage_payload(config: PackageBuildConfig, build_lib: Path) -> None:
 
 def make_build_commands(
     config: PackageBuildConfig,
-) -> tuple[type[_build_py], type[_bdist_wheel]]:
+) -> tuple[type[_build_py], type[_bdist_wheel], type[_install]]:
     class build_py(_build_py):
         def run(self) -> None:
             super().run()
             stage_payload(config, Path(self.build_lib))
 
+    class install(_install):
+        def finalize_options(self) -> None:
+            super().finalize_options()
+            self.install_lib = self.install_platlib
+
     class bdist_wheel(_bdist_wheel):
         def finalize_options(self) -> None:
             super().finalize_options()
@@ -264,4 +270,4 @@ def get_tag(self) -> tuple[str, str, str]:
             _, _, platform_tag = super().get_tag()
             return "py3", "none", platform_tag
 
-    return build_py, bdist_wheel
+    return build_py, bdist_wheel, install

packages/cformat/setup.py

@@ -19,5 +19,6 @@
     cmdclass={
         "build_py": BUILD_HOOKS.build_py,
         "bdist_wheel": BUILD_HOOKS.bdist_wheel,
+        "install": BUILD_HOOKS.install,
     }
 )

packages/ctidy/build_hooks.py

@@ -15,7 +15,7 @@
 sys.modules[MODULE_SPEC.name] = BUILD_HELPERS
 MODULE_SPEC.loader.exec_module(BUILD_HELPERS)
 
-build_py, bdist_wheel = BUILD_HELPERS.make_build_commands(
+build_py, bdist_wheel, install = BUILD_HELPERS.make_build_commands(
     BUILD_HELPERS.PackageBuildConfig(
         package_dir=ROOT,
         package_name="ctidy",

packages/ctidy/cppllvm_build.py

@@ -15,6 +15,7 @@
 
 from setuptools.command.bdist_wheel import bdist_wheel as _bdist_wheel
 from setuptools.command.build_py import build_py as _build_py
+from setuptools.command.install import install as _install
 from setuptools.errors import SetupError
 
 if sys.version_info >= (3, 11):
@@ -249,12 +250,17 @@ def stage_payload(config: PackageBuildConfig, build_lib: Path) -> None:
 
 def make_build_commands(
     config: PackageBuildConfig,
-) -> tuple[type[_build_py], type[_bdist_wheel]]:
+) -> tuple[type[_build_py], type[_bdist_wheel], type[_install]]:
     class build_py(_build_py):
         def run(self) -> None:
             super().run()
             stage_payload(config, Path(self.build_lib))
 
+    class install(_install):
+        def finalize_options(self) -> None:
+            super().finalize_options()
+            self.install_lib = self.install_platlib
+
     class bdist_wheel(_bdist_wheel):
         def finalize_options(self) -> None:
             super().finalize_options()
@@ -264,4 +270,4 @@ def get_tag(self) -> tuple[str, str, str]:
             _, _, platform_tag = super().get_tag()
             return "py3", "none", platform_tag
 
-    return build_py, bdist_wheel
+    return build_py, bdist_wheel, install

packages/ctidy/setup.py

@@ -19,5 +19,6 @@
     cmdclass={
         "build_py": BUILD_HOOKS.build_py,
         "bdist_wheel": BUILD_HOOKS.bdist_wheel,
+        "install": BUILD_HOOKS.install,
     }
 )