devlab-fpga 0.1.4__tar.gz → 0.1.6__tar.gz

{devlab_fpga-0.1.4/devlab_fpga.egg-info → devlab_fpga-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devlab-fpga
-Version: 0.1.4
+Version: 0.1.6
 Summary: FPGA development helper for installing OSS CAD Suite and running build/flash flows.
 Author-email: Mrju10 <name@email.com>
 License: MIT
@@ -68,6 +68,7 @@ different directory.
 OSS CAD Suite tools with the installed suite environment, including the
 official `bin`, `py3bin`, `VIRTUAL_ENV`, `VERILATOR_ROOT`, and `GHDL_PREFIX`
 settings. You do not need to manually source `environment` for those commands.
+`devlab doctor` also checks that `ghdl` and the Yosys GHDL plugin are present.
 
 On Windows, OSS CAD Suite may be distributed as a 7-Zip self-extracting `.exe`
 archive. `devlab install` extracts it automatically into `~/.devlab/toolchains`
@@ -201,7 +202,9 @@ write completed. Keep `verify = false` unless the selected board/programming
 path explicitly supports flash verification.
 
 When sources end in `.vhd` or `.vhdl`, `devlab build` runs Yosys with the
-GHDL plugin before synthesis. OSS CAD Suite is expected to provide that plugin.
+GHDL plugin before synthesis. `devlab` resolves the plugin from the installed
+OSS CAD Suite tree, for example `share/yosys/plugins/ghdl.so` on Linux, and
+falls back to Yosys' plugin search path if a direct path is not found.
 
 Use `--dry-run` to print the commands without executing them:
 

{devlab_fpga-0.1.4 → devlab_fpga-0.1.6}/README.md

@@ -44,6 +44,7 @@ different directory.
 OSS CAD Suite tools with the installed suite environment, including the
 official `bin`, `py3bin`, `VIRTUAL_ENV`, `VERILATOR_ROOT`, and `GHDL_PREFIX`
 settings. You do not need to manually source `environment` for those commands.
+`devlab doctor` also checks that `ghdl` and the Yosys GHDL plugin are present.
 
 On Windows, OSS CAD Suite may be distributed as a 7-Zip self-extracting `.exe`
 archive. `devlab install` extracts it automatically into `~/.devlab/toolchains`
@@ -177,7 +178,9 @@ write completed. Keep `verify = false` unless the selected board/programming
 path explicitly supports flash verification.
 
 When sources end in `.vhd` or `.vhdl`, `devlab build` runs Yosys with the
-GHDL plugin before synthesis. OSS CAD Suite is expected to provide that plugin.
+GHDL plugin before synthesis. `devlab` resolves the plugin from the installed
+OSS CAD Suite tree, for example `share/yosys/plugins/ghdl.so` on Linux, and
+falls back to Yosys' plugin search path if a direct path is not found.
 
 Use `--dry-run` to print the commands without executing them:
 

{devlab_fpga-0.1.4 → devlab_fpga-0.1.6}/devlab/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.1.4"
+__version__ = "0.1.6"

{devlab_fpga-0.1.4 → devlab_fpga-0.1.6}/devlab/project.py

@@ -7,7 +7,7 @@ from pathlib import Path
 from typing import Any
 
 from .errors import DevlabError
-from .toolchain import env_with_toolchain, find_executable, install_path
+from .toolchain import env_with_toolchain, find_executable, find_yosys_plugin, install_path
 
 try:
     import tomllib
@@ -287,6 +287,7 @@ def doctor(strict: bool = False) -> int:
     checks = {
         "yosys": find_executable("yosys", install_path()),
         "ghdl": find_executable("ghdl", install_path()),
+        "yosys-ghdl-plugin": find_yosys_plugin("ghdl", install_path()),
         "nextpnr-himbaechel": find_executable("nextpnr-himbaechel", install_path()),
         "gowin_pack": find_executable("gowin_pack", install_path()),
         "nextpnr-ice40": find_executable("nextpnr-ice40", install_path()),
@@ -311,10 +312,11 @@ def _yosys_command(config: BuildConfig, synth_script: str) -> list[str]:
     hdl = _source_hdl(config.sources)
     if hdl == "vhdl":
         sources = " ".join(shlex.quote(source) for source in config.sources)
+        ghdl_plugin = find_yosys_plugin("ghdl", install_path()) or "ghdl"
         return [
             "yosys",
             "-m",
-            "ghdl",
+            ghdl_plugin,
             "-p",
             f"ghdl --std=08 {sources} -e {config.top}; {synth_script}",
         ]

{devlab_fpga-0.1.4 → devlab_fpga-0.1.6}/devlab/toolchain.py

@@ -113,6 +113,12 @@ def bin_dirs(path: Path | None = None) -> list[Path]:
     return [path / "oss-cad-suite" / "bin", path / "bin"]
 
 
+def yosys_plugin_dirs(path: Path | None = None) -> list[Path]:
+    path = path or install_path()
+    root = _toolchain_root(path)
+    return [root / "share" / "yosys" / "plugins", root / "lib" / "yosys"]
+
+
 def _toolchain_root(path: Path) -> Path:
     nested_root = path / "oss-cad-suite"
     if nested_root.exists():
@@ -125,6 +131,11 @@ def env_with_toolchain(path: Path | None = None) -> dict[str, str]:
     root = _toolchain_root(path)
     env = os.environ.copy()
     tool_dirs = [*bin_dirs(path), root / "py3bin"]
+    
+    # On Windows, add lib directory to PATH for DLL resolution
+    if sys.platform.startswith("win"):
+        tool_dirs.append(root / "lib")
+    
     binary_dirs = os.pathsep.join(str(candidate) for candidate in tool_dirs)
     env["PATH"] = binary_dirs + os.pathsep + env.get("PATH", "")
     env["VIRTUAL_ENV"] = str(root)
@@ -152,6 +163,26 @@ def find_executable(name: str, path: Path | None = None) -> str | None:
     return shutil.which(name, path=env_with_toolchain(path).get("PATH"))
 
 
+def find_yosys_plugin(name: str, path: Path | None = None) -> str | None:
+    suffixes = [".so", ".dll", ".dylib", ""]
+    for plugin_dir in yosys_plugin_dirs(path):
+        for suffix in suffixes:
+            candidate = plugin_dir / f"{name}{suffix}"
+            if candidate.exists():
+                return str(candidate)
+    return None
+
+
+def missing_toolchain_components(path: Path | None = None) -> list[str]:
+    path = path or install_path()
+    checks = {
+        "yosys": find_executable("yosys", path),
+        "ghdl": find_executable("ghdl", path),
+        "yosys-ghdl-plugin": find_yosys_plugin("ghdl", path),
+    }
+    return [name for name, found in checks.items() if not found]
+
+
 def download_asset(asset: ToolchainAsset, destination: Path, force: bool = False) -> Path:
     destination.parent.mkdir(parents=True, exist_ok=True)
     if destination.exists() and not force:
@@ -201,36 +232,47 @@ def install_oss_cad_suite(
     asset = select_asset()
     destination = install_path(asset, home)
 
-    if destination.exists() and find_executable("yosys", destination) and not force:
+    if (
+        destination.exists()
+        and not missing_toolchain_components(destination)
+        and not force
+    ):
         return destination
 
     archive = download_asset(asset, archive_path(asset, home), force=force)
 
     if asset.name.endswith(".exe"):
         _extract_windows_sfx(archive, destination, force=force)
-        if not find_executable("yosys", destination):
-            raise DevlabError(
-                "The Windows OSS CAD Suite archive was extracted, "
-                "but yosys was not found in "
-                f"{destination}\\oss-cad-suite\\bin or {destination}\\bin. "
-                "Check the extracted files, then run `devlab doctor`."
-            )
+        _ensure_toolchain_ready(destination, "Windows OSS CAD Suite archive")
         return destination
 
     if asset.name.endswith(".zip"):
         _extract_zip(archive, destination, force=force)
+        _ensure_toolchain_ready(destination, "OSS CAD Suite zip archive")
         return destination
 
     _extract_tarball(archive, destination, force=force)
     for binary_dir in bin_dirs(destination):
         _mark_executables(binary_dir)
+    _ensure_toolchain_ready(destination, "OSS CAD Suite tarball")
     return destination
 
 
+def _ensure_toolchain_ready(destination: Path, archive_description: str) -> None:
+    missing = missing_toolchain_components(destination)
+    if missing:
+        missing_list = ", ".join(missing)
+        raise DevlabError(
+            f"The {archive_description} was extracted, but these components "
+            f"were not found: {missing_list}. Check the extracted files, "
+            "then run `devlab doctor`."
+        )
+
+
 def _move_extracted_tree(source: Path, destination: Path, force: bool) -> None:
     destination.parent.mkdir(parents=True, exist_ok=True)
     if destination.exists():
-        if not force and find_executable("yosys", destination):
+        if not force and not missing_toolchain_components(destination):
             raise DevlabError(f"Install destination already exists: {destination}")
         shutil.rmtree(destination)
 

{devlab_fpga-0.1.4 → devlab_fpga-0.1.6/devlab_fpga.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devlab-fpga
-Version: 0.1.4
+Version: 0.1.6
 Summary: FPGA development helper for installing OSS CAD Suite and running build/flash flows.
 Author-email: Mrju10 <name@email.com>
 License: MIT
@@ -68,6 +68,7 @@ different directory.
 OSS CAD Suite tools with the installed suite environment, including the
 official `bin`, `py3bin`, `VIRTUAL_ENV`, `VERILATOR_ROOT`, and `GHDL_PREFIX`
 settings. You do not need to manually source `environment` for those commands.
+`devlab doctor` also checks that `ghdl` and the Yosys GHDL plugin are present.
 
 On Windows, OSS CAD Suite may be distributed as a 7-Zip self-extracting `.exe`
 archive. `devlab install` extracts it automatically into `~/.devlab/toolchains`
@@ -201,7 +202,9 @@ write completed. Keep `verify = false` unless the selected board/programming
 path explicitly supports flash verification.
 
 When sources end in `.vhd` or `.vhdl`, `devlab build` runs Yosys with the
-GHDL plugin before synthesis. OSS CAD Suite is expected to provide that plugin.
+GHDL plugin before synthesis. `devlab` resolves the plugin from the installed
+OSS CAD Suite tree, for example `share/yosys/plugins/ghdl.so` on Linux, and
+falls back to Yosys' plugin search path if a direct path is not found.
 
 Use `--dry-run` to print the commands without executing them:
 

{devlab_fpga-0.1.4 → devlab_fpga-0.1.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devlab-fpga"
-version = "0.1.4"
+version = "0.1.6"
 description = "FPGA development helper for installing OSS CAD Suite and running build/flash flows."
 readme = "README.md"
 requires-python = ">=3.9"