devlab-fpga 0.1.2__tar.gz → 0.1.3__tar.gz

{devlab_fpga-0.1.2/devlab_fpga.egg-info → devlab_fpga-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devlab-fpga
-Version: 0.1.2
+Version: 0.1.3
 Summary: FPGA development helper for installing OSS CAD Suite and running build/flash flows.
 Author-email: Mrju10 <name@email.com>
 License: MIT
@@ -64,6 +64,11 @@ YosysHQ. The installer selects the correct asset for:
 The default install location is `~/.devlab`. Set `DEVLAB_HOME` to use a
 different directory.
 
+`devlab build`, `devlab flash`, and `devlab flash --detect` automatically run
+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.
+
 On Windows, OSS CAD Suite may be distributed as a 7-Zip self-extracting `.exe`
 archive. `devlab install` extracts it automatically into `~/.devlab/toolchains`
 without opening an installer:
@@ -176,6 +181,7 @@ run detection:
 
 ```bash
 devlab flash --detect
+devlab flash --detect --board tangnano9k
 ```
 
 Persistent flash can also be configured in `devlab.toml`:

{devlab_fpga-0.1.2 → devlab_fpga-0.1.3}/README.md

@@ -40,6 +40,11 @@ YosysHQ. The installer selects the correct asset for:
 The default install location is `~/.devlab`. Set `DEVLAB_HOME` to use a
 different directory.
 
+`devlab build`, `devlab flash`, and `devlab flash --detect` automatically run
+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.
+
 On Windows, OSS CAD Suite may be distributed as a 7-Zip self-extracting `.exe`
 archive. `devlab install` extracts it automatically into `~/.devlab/toolchains`
 without opening an installer:
@@ -152,6 +157,7 @@ run detection:
 
 ```bash
 devlab flash --detect
+devlab flash --detect --board tangnano9k
 ```
 
 Persistent flash can also be configured in `devlab.toml`:

{devlab_fpga-0.1.2 → devlab_fpga-0.1.3}/devlab/project.py

@@ -166,8 +166,8 @@ def detect_flash(
     board: str | None = None,
     dry_run: bool = False,
 ) -> None:
-    config = load_config(config_path)
-    selected_board = board or config.board
+    config = load_config(config_path) if config_path or not board else None
+    selected_board = board or (config.board if config else None)
     if not selected_board:
         raise DevlabError(
             "No flash board configured. Add [flash] board = \"...\" "

{devlab_fpga-0.1.2 → devlab_fpga-0.1.3}/devlab/toolchain.py

@@ -113,10 +113,26 @@ def bin_dirs(path: Path | None = None) -> list[Path]:
     return [path / "oss-cad-suite" / "bin", path / "bin"]
 
 
+def _toolchain_root(path: Path) -> Path:
+    nested_root = path / "oss-cad-suite"
+    if nested_root.exists():
+        return nested_root
+    return path
+
+
 def env_with_toolchain(path: Path | None = None) -> dict[str, str]:
+    path = path or install_path()
+    root = _toolchain_root(path)
     env = os.environ.copy()
-    binary_dirs = os.pathsep.join(str(candidate) for candidate in bin_dirs(path))
+    tool_dirs = [*bin_dirs(path), root / "py3bin"]
+    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)
+    env["VIRTUAL_ENV_PROMPT"] = "OSS CAD Suite"
+    env["VERILATOR_ROOT"] = str(root / "share" / "verilator")
+    env["GHDL_PREFIX"] = str(root / "lib" / "ghdl")
+    env["OPENFPGALOADER_SOJ_DIR"] = str(root / "share" / "openFPGALoader")
+    env.pop("PYTHONHOME", None)
     return env
 
 

{devlab_fpga-0.1.2 → devlab_fpga-0.1.3/devlab_fpga.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devlab-fpga
-Version: 0.1.2
+Version: 0.1.3
 Summary: FPGA development helper for installing OSS CAD Suite and running build/flash flows.
 Author-email: Mrju10 <name@email.com>
 License: MIT
@@ -64,6 +64,11 @@ YosysHQ. The installer selects the correct asset for:
 The default install location is `~/.devlab`. Set `DEVLAB_HOME` to use a
 different directory.
 
+`devlab build`, `devlab flash`, and `devlab flash --detect` automatically run
+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.
+
 On Windows, OSS CAD Suite may be distributed as a 7-Zip self-extracting `.exe`
 archive. `devlab install` extracts it automatically into `~/.devlab/toolchains`
 without opening an installer:
@@ -176,6 +181,7 @@ run detection:
 
 ```bash
 devlab flash --detect
+devlab flash --detect --board tangnano9k
 ```
 
 Persistent flash can also be configured in `devlab.toml`:

{devlab_fpga-0.1.2 → devlab_fpga-0.1.3}/pyproject.toml

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