Skip to content

fix: improve vivado binary handling in argument parser #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
taraxacum45e9a wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix: improve vivado binary handling in argument parser #141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions linker/slashkit/core/command_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class CommandConfiguration(object):
@classmethod
def populate_argument_parser(cls, ap: argparse.ArgumentParser):
ap.formatter_class = argparse.RawTextHelpFormatter
ap.add_argument("--vivado", required=False, type=Path, default=None,
ap.add_argument("--vivado", required=False, type=Path, default=shutil.which("vivado"),
help="Vivado binary to use for linking. If not given, it will be derived from PATH.")
ap.add_argument("--jobs", required=False, type=int, default=8,
help="Number of parallel jobs for Vivado runs.")
Expand All @@ -76,9 +76,11 @@ def __init__(self, args: argparse.Namespace):
self._args = args

# Resolve, if necessary find, and verify the Vivado binary
self._vivado_bin: Path = args.vivado if args.vivado is not None else Path(
shutil.which("vivado"))
self._vivado_bin = self._vivado_bin.expanduser().resolve()
if not args.vivado:
raise ValueError(
"Vivado binary not specified and could not be found on PATH.")

self._vivado_bin = Path(args.vivado).expanduser().resolve()
if not self._vivado_bin.is_file():
raise FileNotFoundError(self._vivado_bin)

Expand Down