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

{devlab_fpga-0.1.1/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.1
+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,14 +64,28 @@ YosysHQ. The installer selects the correct asset for:
 The default install location is `~/.devlab`. Set `DEVLAB_HOME` to use a
 different directory.
 
-On Windows, OSS CAD Suite is distributed as an `.exe` installer. Run:
+`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:
 
 ```powershell
-devlab install --run-installer
+devlab install
 ```
 
-The compatibility shortcut `devlab --run-installer` also runs the Windows
-installer.
+The installed tree keeps the official OSS CAD Suite layout:
+
+```text
+~/.devlab/toolchains/oss-cad-suite-2026-07-06-windows-x64/
+  oss-cad-suite/
+    bin/
+    environment.bat
+    environment.ps1
+```
 
 ## OSS CAD Suite Source
 
@@ -167,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.1 → devlab_fpga-0.1.3}/README.md

@@ -40,14 +40,28 @@ YosysHQ. The installer selects the correct asset for:
 The default install location is `~/.devlab`. Set `DEVLAB_HOME` to use a
 different directory.
 
-On Windows, OSS CAD Suite is distributed as an `.exe` installer. Run:
+`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:
 
 ```powershell
-devlab install --run-installer
+devlab install
 ```
 
-The compatibility shortcut `devlab --run-installer` also runs the Windows
-installer.
+The installed tree keeps the official OSS CAD Suite layout:
+
+```text
+~/.devlab/toolchains/oss-cad-suite-2026-07-06-windows-x64/
+  oss-cad-suite/
+    bin/
+    environment.bat
+    environment.ps1
+```
 
 ## OSS CAD Suite Source
 
@@ -143,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.1 → devlab_fpga-0.1.3}/devlab/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.1.1"
+__version__ = "0.1.2"

{devlab_fpga-0.1.1 → devlab_fpga-0.1.3}/devlab/cli.py

@@ -27,7 +27,7 @@ def build_parser() -> argparse.ArgumentParser:
     parser.add_argument(
         "--run-installer",
         action="store_true",
-        help="Shortcut for `devlab install --run-installer` on Windows.",
+        help="Deprecated compatibility flag. Windows install is automatic.",
     )
 
     commands = parser.add_subparsers(dest="command")
@@ -45,7 +45,7 @@ def build_parser() -> argparse.ArgumentParser:
     install_parser.add_argument(
         "--run-installer",
         action="store_true",
-        help="On Windows, execute the downloaded OSS CAD Suite installer.",
+        help="Deprecated compatibility flag. Windows install is automatic.",
     )
     install_parser.set_defaults(func=_install)
 

{devlab_fpga-0.1.1 → 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.1 → devlab_fpga-0.1.3}/devlab/toolchain.py

@@ -9,6 +9,7 @@ import sys
 import tarfile
 import tempfile
 import urllib.request
+import zipfile
 from dataclasses import dataclass
 from pathlib import Path
 
@@ -104,18 +105,34 @@ def archive_path(asset: ToolchainAsset | None = None, home: Path | None = None)
 
 def bin_dir(path: Path | None = None) -> Path:
     path = path or install_path()
-    return path / "bin"
+    return path / "oss-cad-suite" / "bin"
 
 
 def bin_dirs(path: Path | None = None) -> list[Path]:
     path = path or install_path()
-    return [path / "bin", path / "oss-cad-suite" / "bin"]
+    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
 
 
@@ -190,46 +207,69 @@ def install_oss_cad_suite(
     archive = download_asset(asset, archive_path(asset, home), force=force)
 
     if asset.name.endswith(".exe"):
-        if not run_windows_installer:
-            raise DevlabError(
-                "Windows uses the OSS CAD Suite .exe installer. "
-                f"The file was downloaded to {archive}. Re-run with "
-                "`devlab install --run-installer` to execute it."
-            )
-        subprocess.check_call([str(archive)])
+        _extract_windows_sfx(archive, destination, force=force)
         if not find_executable("yosys", destination):
             raise DevlabError(
-                "The Windows installer finished, but yosys was not found in "
-                f"{destination}\\bin or {destination}\\oss-cad-suite\\bin. "
-                "Install or extract OSS CAD Suite into that toolchain directory, "
-                "then run `devlab doctor`."
+                "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`."
             )
         return destination
 
+    if asset.name.endswith(".zip"):
+        _extract_zip(archive, destination, force=force)
+        return destination
+
     _extract_tarball(archive, destination, force=force)
-    _mark_executables(bin_dir(destination))
+    for binary_dir in bin_dirs(destination):
+        _mark_executables(binary_dir)
     return destination
 
 
-def _extract_tarball(archive: Path, destination: Path, force: bool) -> None:
+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:
+        if not force and find_executable("yosys", destination):
             raise DevlabError(f"Install destination already exists: {destination}")
         shutil.rmtree(destination)
 
+    destination.mkdir(parents=True)
+    for child in source.iterdir():
+        shutil.move(str(child), destination / child.name)
+
+
+def _extract_windows_sfx(archive: Path, destination: Path, force: bool) -> None:
+    destination.parent.mkdir(parents=True, exist_ok=True)
+    with tempfile.TemporaryDirectory(
+        prefix="devlab-oss-cad-suite-", dir=destination.parent
+    ) as tmp:
+        tmp_path = Path(tmp)
+        try:
+            subprocess.check_call([str(archive), f"-o{tmp_path}", "-y"], cwd=tmp_path)
+        except subprocess.CalledProcessError as exc:
+            raise DevlabError(
+                f"Could not extract Windows OSS CAD Suite archive: {exc}"
+            ) from exc
+        _move_extracted_tree(tmp_path, destination, force=force)
+
+
+def _extract_zip(archive: Path, destination: Path, force: bool) -> None:
+    with tempfile.TemporaryDirectory(prefix="devlab-oss-cad-suite-") as tmp:
+        tmp_path = Path(tmp)
+        with zipfile.ZipFile(archive) as zip_file:
+            _safe_extract_zip(zip_file, tmp_path)
+
+        _move_extracted_tree(tmp_path, destination, force=force)
+
+
+def _extract_tarball(archive: Path, destination: Path, force: bool) -> None:
     with tempfile.TemporaryDirectory(prefix="devlab-oss-cad-suite-") as tmp:
         tmp_path = Path(tmp)
         with tarfile.open(archive, "r:gz") as tar:
             _safe_extract(tar, tmp_path)
 
-        children = [child for child in tmp_path.iterdir()]
-        if len(children) == 1 and children[0].is_dir():
-            shutil.move(str(children[0]), destination)
-        else:
-            destination.mkdir(parents=True)
-            for child in children:
-                shutil.move(str(child), destination / child.name)
+        _move_extracted_tree(tmp_path, destination, force=force)
 
 
 def _safe_extract(tar: tarfile.TarFile, destination: Path) -> None:
@@ -244,6 +284,15 @@ def _safe_extract(tar: tarfile.TarFile, destination: Path) -> None:
         tar.extractall(destination)
 
 
+def _safe_extract_zip(zip_file: zipfile.ZipFile, destination: Path) -> None:
+    destination = destination.resolve()
+    for member in zip_file.infolist():
+        target = (destination / member.filename).resolve()
+        if destination != target and destination not in target.parents:
+            raise DevlabError(f"Unsafe path in archive: {member.filename}")
+    zip_file.extractall(destination)
+
+
 def _mark_executables(path: Path) -> None:
     if not path.exists():
         return

{devlab_fpga-0.1.1 → 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.1
+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,14 +64,28 @@ YosysHQ. The installer selects the correct asset for:
 The default install location is `~/.devlab`. Set `DEVLAB_HOME` to use a
 different directory.
 
-On Windows, OSS CAD Suite is distributed as an `.exe` installer. Run:
+`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:
 
 ```powershell
-devlab install --run-installer
+devlab install
 ```
 
-The compatibility shortcut `devlab --run-installer` also runs the Windows
-installer.
+The installed tree keeps the official OSS CAD Suite layout:
+
+```text
+~/.devlab/toolchains/oss-cad-suite-2026-07-06-windows-x64/
+  oss-cad-suite/
+    bin/
+    environment.bat
+    environment.ps1
+```
 
 ## OSS CAD Suite Source
 
@@ -167,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.1 → devlab_fpga-0.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devlab-fpga"
-version = "0.1.1"
+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"