fix: delete auxilar files for vivado linter

TerosTechnology · Jul 30, 2023 · b5c4003 · b5c4003
1 parent e5195d5
commit b5c4003
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/packages/colibri/src/linter/base_linter.ts b/packages/colibri/src/linter/base_linter.ts
@@ -70,27 +70,27 @@ export abstract class Base_linter {
     }
 
     async exec_linter(file: string, options: common.l_options) {
-        this.delete_previus_lint();
+        const file_dir = get_directory(file);
+        this.delete_previus_lint(file_dir);
 
         const command = this.get_command(file, options);
 
         const msg = `Linting with command: ${command} `;
         logger.Logger.log(msg, logger.T_SEVERITY.INFO);
 
         const P = new Process();
-        const file_dir = get_directory(file);
         const opt: p_options = {
             cwd: file_dir,
         };
         const result = await P.exec_wait(command, opt);
 
-        this.delete_previus_lint();
+        this.delete_previus_lint(file_dir);
         return result;
     }
 
     abstract lint(file: string, options: common.l_options): Promise<common.l_error[]>;
 
-    abstract delete_previus_lint(): void;
+    abstract delete_previus_lint(working_dir: string): void;
 
     public async lint_from_project(file_path: string, _prj_file_list: t_file[],
         options: common.l_options): Promise<common.l_error[]> {

diff --git a/packages/colibri/src/linter/vivado.ts b/packages/colibri/src/linter/vivado.ts
@@ -19,13 +19,14 @@
 
 import { get_os } from "../process/utils";
 import { Process } from "../process/process";
-import { OS } from "../process/common";
+import { OS, p_options } from "../process/common";
 
 import { get_hdl_language } from "../utils/common_utils";
 import { HDL_LANG } from "../common/general";
 
 import { Base_linter } from "./base_linter";
 import * as common from "./common";
+import * as logger from "../logger/logger";
 
 export class Vivado extends Base_linter {
     binary = "";
@@ -51,20 +52,26 @@ export class Vivado extends Base_linter {
         this.binary = binary;
     }
 
-    async delete_previus_lint() {
+    async delete_previus_lint(working_dir: string) {
+        const opt: p_options = {
+            cwd: working_dir,
+        };
+
         const os = get_os();
         const p = new Process();
         if (os === OS.WINDOWS) {
             let command = 'del xvhdl.pb && del xvhdl.log && rmdir xsim.dir';
-            await p.exec_wait(command);
+            await p.exec_wait(command, opt);
+
             command = 'del xvlog.pb && del xvlog.log && rmdir xsim.dir';
-            await p.exec_wait(command);
+            await p.exec_wait(command, opt);
         }
         else {
             let command = 'rm xvhdl.pb; rm xvhdl.log; rm -R xsim.dir';
-            await p.exec_wait(command);
+            await p.exec_wait(command, opt);
+
             command = 'rm xvlog.pb; rm xvlog.log; rm -R xsim.dir';
-            await p.exec_wait(command);
+            await p.exec_wait(command, opt);
         }
     }
 

diff --git a/packages/teroshdl/auto_package/templates/info.nj b/packages/teroshdl/auto_package/templates/info.nj
@@ -2,7 +2,7 @@
 "displayName": "TerosHDL",
 "publisher": "teros-technology",
 "description": "Powerful IDE for ASIC/FPGA: state machine viewer, linter, documentation, snippets... and more! ",
-"version": "5.0.7",
+"version": "5.0.8",
 "engines": {
     "vscode": "^1.74.0"
 },

diff --git a/packages/teroshdl/package.json b/packages/teroshdl/package.json
@@ -3,7 +3,7 @@
     "displayName": "TerosHDL",
     "publisher": "teros-technology",
     "description": "Powerful IDE for ASIC/FPGA: state machine viewer, linter, documentation, snippets... and more! ",
-    "version": "5.0.7",
+    "version": "5.0.8",
     "engines": {
         "vscode": "^1.74.0"
     },

diff --git a/packages/teroshdl/resources/release_notes/release-notes.html b/packages/teroshdl/resources/release_notes/release-notes.html
@@ -45,6 +45,7 @@ <h4 id="release-notes"> Minor changes v5.0.5 and v5.0.7</h4>
             <li> Support for GUI in VUnit</li>
             <li> Support for "copy as VHDL component" in Verilog/SV templates</li>
             <li> Fix bug verilog arguments ModelSim</li>
+            <li> Delete auxiliar files in Vivado linter</li>
         </ul>
     </p>