refractor HHD

scripts/build_nuitka.py

@@ -27,7 +27,6 @@ INCLUDE_LAYOUT = {
     },
 }
 
-
 def install_nuitka():
     print("Checking Nuitka installation...")
     try:
@@ -50,14 +49,15 @@ def get_version() -> str:
     return "0.3.1"
 
 
-def find_compiled_extension(output_dir: Path) -> Path:
+def find_compiled_extension(output_dir: Path, module_name: str) -> Path:
     candidates = []
     for suffix in EXTENSION_SUFFIXES:
-        candidates.extend(output_dir.glob(f"*{suffix}"))
+        candidates.extend(output_dir.glob(f"{module_name}*{suffix}"))
     if not candidates:
         all_files = ", ".join(p.name for p in output_dir.iterdir()) if output_dir.exists() else "(none)"
-        raise RuntimeError(f"Nuitka did not produce a compiled extension. Found: {all_files}")
-    # Prefer the shortest filename (usually the package extension itself)
+        raise RuntimeError(
+            f"Nuitka did not produce a compiled extension for {module_name}. Found: {all_files}"
+        )
     return sorted(candidates, key=lambda p: len(p.name))[0]
 
 
@@ -71,6 +71,40 @@ def move_wheel_to_sdk(wheel_path: Path, version: str) -> Path:
     return dest_wheel
 
 
+def compile_orisys(build_root: Path, env: dict[str, str]) -> Path:
+    module_output_dir = build_root / "orisys"
+    if module_output_dir.exists():
+        shutil.rmtree(module_output_dir)
+    module_output_dir.mkdir(parents=True)
+
+    cmd = [
+        sys.executable,
+        "-m",
+        "nuitka",
+        "--module",
+        "--include-package=orisys",
+        "--output-dir=" + str(module_output_dir),
+        "--remove-output",
+        "--no-pyi-file",
+        "src/orisys",
+    ]
+
+    print(f"Running: {' '.join(cmd)}")
+    subprocess.check_call(cmd, env=env)
+
+    ext_file = find_compiled_extension(module_output_dir, "orisys")
+    print(f"Generated compiled extension for orisys: {ext_file}")
+    return ext_file
+
+
+def copy_compiled_orisys(pkg_dir: Path, ext_file: Path) -> str:
+    ext_suffix = "".join(ext_file.suffixes)
+    dest_ext = pkg_dir / f"__init__{ext_suffix}"
+    shutil.copy(ext_file, dest_ext)
+    print(f"Copied compiled module orisys to {dest_ext}")
+    return ext_suffix
+
+
 def copy_included_files(pkg_dir: Path) -> dict[str, int]:
     copied_counts = {}
     for group_name, group_cfg in INCLUDE_LAYOUT.items():
@@ -100,7 +134,10 @@ def copy_included_files(pkg_dir: Path) -> dict[str, int]:
 
 
 def get_package_data_entries(ext_suffix: str) -> dict[str, list[str]]:
-    package_data = {"orisys": [f"*{ext_suffix}"], "orisys.examples": ["*.py"]}
+    package_data = {
+        "orisys": [f"*{ext_suffix}"],
+        "orisys.examples": ["*.py"],
+    }
     for group_name, group_cfg in INCLUDE_LAYOUT.items():
         if group_name == "examples":
             continue
@@ -127,31 +164,14 @@ def build():
     print("\n=== Compiling with Nuitka ===")
     env = os.environ.copy()
     env["PYTHONPATH"] = "src" + os.pathsep + env.get("PYTHONPATH", "")
-
-    cmd = [
-        sys.executable, "-m", "nuitka",
-        "--module",
-        "--include-package=orisys",
-        "--output-dir=" + str(output_dir),
-        "--remove-output",
-        "--no-pyi-file",
-        "src/orisys",
-    ]
-    print(f"Running: {' '.join(cmd)}")
-    subprocess.check_call(cmd, env=env)
-
-    ext_file = find_compiled_extension(output_dir)
-    ext_suffix = "".join(ext_file.suffixes)
-    print(f"Generated compiled extension: {ext_file}")
+    ext_file = compile_orisys(output_dir, env)
 
     print("\n=== Preparing Wheel Structure ===")
     wheel_root = dist_dir / "wheel_root"
     pkg_dir = wheel_root / "orisys"
     pkg_dir.mkdir(parents=True)
 
-    dest_ext = pkg_dir / f"__init__{ext_suffix}"
-    shutil.copy(ext_file, dest_ext)
-    print(f"Copied compiled package to {dest_ext}")
+    ext_suffix = copy_compiled_orisys(pkg_dir, ext_file)
 
     copied_counts = copy_included_files(pkg_dir)
     print(f"Copied {copied_counts['configs']} JSON config files")