Skip to content

Fix Vivado detection on Windows for unwrapped installations (Fix #821) #848

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
radami2006 wants to merge 1 commit into
base: dev
Choose a base branch
from
+8 −0
Open

Fix Vivado detection on Windows for unwrapped installations (Fix #821) #848

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
8 changes: 8 additions & 0 deletions src/colibri/linter/vivado.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { LANGUAGE } from "../common/general";
import { Base_linter } from "./base_linter";
import * as common from "./common";
import * as path_lib from "path";
import { BinaryCheck, checkBinary } from "colibri/toolChecker/utils";

export class Vivado extends Base_linter {
binary = "vivado";
Expand All @@ -35,6 +36,13 @@ export class Vivado extends Base_linter {
super();
}

public async checkLinterConfiguration(installationPath: string): Promise<BinaryCheck> {
// Vivado installations can expose either wrapper binaries (vivado) or
// direct lint binaries (xvhdl/xvlog), depending on the configured folder.
const binaryCandidates = ["xvhdl", "xvlog", "vivado"];
return await checkBinary(this.constructor.name, installationPath, binaryCandidates, this.argumentToCheck);
}

public set_binary(file: string) {
const file_lang = get_language_from_filepath(file);
let binary = "";
Expand Down