Merge pull request #130 from github0null/dev

v3.6.3 revision
github0null · May 15, 2022 · af7ef08 · af7ef08
2 parents f3d6f12 + 8c8dae9
commit af7ef08
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ***
 
-### [v3.6.2]
+### [v3.6.3]
 
 **Fixed**:
   - When there are too many nested folders, the response is slow when excluding directories.

diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "homepage": "https://github.com/github0null/eide/blob/master/README.md",
     "license": "MIT",
     "description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/RISC-V",
-    "version": "3.6.2",
+    "version": "3.6.3",
     "preview": false,
     "engines": {
         "vscode": "^1.63.0"

diff --git a/src/CodeBuilder.ts b/src/CodeBuilder.ts
@@ -29,7 +29,7 @@ import * as events from 'events';
 import * as globmatch from 'micromatch'
 import * as os from 'os';
 
-import { AbstractProject } from "./EIDEProject";
+import { AbstractProject, VirtualSource } from "./EIDEProject";
 import { ResManager } from "./ResManager";
 import { File } from "../lib/node-utility/File";
 import {
@@ -129,7 +129,7 @@ export abstract class CodeBuilder {
                 const rePath = this.project.ToRelativePath(source.file.path, false);
                 const fInfo: any = { path: rePath || source.file.path }
                 if (AbstractProject.isVirtualSourceGroup(group)) {
-                    fInfo.virtualPath = `${group.name}/${source.file.name}`
+                    fInfo.virtualPath = `${group.name}/${source.file.name}`.replace(`${VirtualSource.rootName}/`, '');
                 }
                 srcList.push(fInfo);
             }

diff --git a/src/EIDEProject.ts b/src/EIDEProject.ts
@@ -2053,7 +2053,7 @@ class EIDEProject extends AbstractProject {
 
             // virtual files
             if (vPath && typeof this.srcExtraCompilerConfig?.virtualPathFiles == 'object') {
-                matcher(this.srcExtraCompilerConfig?.virtualPathFiles, vPath);
+                matcher(this.srcExtraCompilerConfig?.virtualPathFiles, vPath.replace(`${VirtualSource.rootName}/`, ''));
             }
         }
 

diff --git a/src/extension.ts b/src/extension.ts
@@ -396,7 +396,7 @@ async function checkAndInstallBinaries(forceInstall?: boolean): Promise<boolean>
                     localVersion = cont;
                     const mainLocalVersion = parseInt(localVersion.split('.')[0]);
                     const mainMinReqVersion = parseInt(minReqVersion.split('.')[0]);
-                    if (mainMinReqVersion > mainLocalVersion) { // local Main verson < min Main version
+                    if (mainMinReqVersion != mainLocalVersion) { // local Main verson != min Main version
                         localVersion = undefined; // local binaries is invalid, force update
                     }
                 }