feat: run yowasp-yosys from output dir

TerosTechnology · Oct 3, 2024 · 7b7f607 · 7b7f607
1 parent f1314cf
commit 7b7f607
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/auto_package/templates/info.nj b/auto_package/templates/info.nj
@@ -2,7 +2,7 @@
 "displayName": "TerosHDL",
 "publisher": "teros-technology",
 "description": "Powerful toolbox for ASIC/FPGA: state machine viewer, linter, documentation, snippets... and more! ",
-"version": "6.0.9",
+"version": "6.0.10",
 "engines": {
     "vscode": "^1.74.0"
 },

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

diff --git a/src/colibri/yosys/yosys.ts b/src/colibri/yosys/yosys.ts
@@ -79,13 +79,15 @@ export function runYosysRaw(config: e_config, topTevel: string, sources: t_file[
 
     const outputPathFilename = config.schematic.general.backend === e_schematic_general_backend.yowasp ?
         process_utils.createTempFileInHome("") : process_utils.create_temp_file("");
+
+    const outputPathName = file_utils.get_filename(outputPathFilename, true);
 
     let cmd =
         // eslint-disable-next-line max-len
-        `${preArguments} ${yosysPath} -p "${cmdFiles}; ${topLevelCmd}; proc; ${customArguments}; write_json ${outputPathFilename}; stat"`;
+        `${preArguments} ${yosysPath} -p "${cmdFiles}; ${topLevelCmd}; proc; ${customArguments}; write_json ${outputPathName}; stat"`;
     cmd = removeEmptyCommands(cmd);
 
-    const opt_exec = { cwd: get_directory(topTevel) };
+    const opt_exec = { cwd: get_directory(outputPathFilename) };
 
     const p = new Process();
     const exec_i = p.exec(cmd, opt_exec, (result: p_result) => {
@@ -276,4 +278,4 @@ function normalizePathForLinux(filepath: string): string {
     }
     const normalizedPath = path_lib.normalize(filepath);
     return normalizedPath.replace(/\\/g, '/');
-}
+}