Merge pull request #217 from github0null/dev

v3.11.1 patch

Author: github0null

CHANGELOG.md

@@ -6,7 +6,7 @@ All notable version changes will be recorded in this file.
 
 ***
 
-### [v3.11.0] revision
+### [v3.11.1] update
 
 **New**:
   - `Object Order For Linker`: Allow specify an order for any obj files before the builder start to link your program.

package.json

@@ -35,7 +35,7 @@
     "homepage": "https://em-ide.com",
     "license": "MIT",
     "description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/RISC-V",
-    "version": "3.11.0",
+    "version": "3.11.1",
     "preview": false,
     "engines": {
         "vscode": "^1.67.0"

src/EIDEProject.ts

@@ -226,7 +226,7 @@ export class VirtualSource implements SourceProvider {
 
         this.traverse((folderInfo) => {
             result.push({
-                name: folderInfo.path.replace(`${VirtualSource.rootName}/`, ''),
+                name: folderInfo.path,
                 disabled: this.project.isExcluded(folderInfo.path) || undefined,
                 files: folderInfo.folder.files.map((vFile) => {
                     const file = new File(this.project.ToAbsolutePath(vFile.path));
@@ -2611,7 +2611,7 @@ class EIDEProject extends AbstractProject {
     }
 
     private getExtraCompilerOptionsBySrcFile(srcPath: string, vPath?: string): string[] | undefined {
-       return this.getExtraArgsForSource(srcPath, vPath, this.getSourceExtraArgsCfg());
+        return this.getExtraArgsForSource(srcPath, vPath, this.getSourceExtraArgsCfg());
     }
 
     //////////////////////////////// source refs ///////////////////////////////////
@@ -2830,12 +2830,16 @@ class EIDEProject extends AbstractProject {
 
             // is virtual source
             else {
-                fileGroups.push(_group);
+                fileGroups.push({
+                    name: _group.name.replace(`${VirtualSource.rootName}/`, ''), // remove '<virtual_root>/' header for keil
+                    files: _group.files,
+                    disabled: _group.disabled
+                });
             }
         });
 
         if (halFiles.length > 0) {
-            const index = fileGroups.findIndex((group) => { return group.name === 'HAL'; });
+            const index = fileGroups.findIndex((group) => group.name === 'HAL');
             if (index === -1) {
                 fileGroups.push(<FileGroup>{
                     name: 'HAL',

src/EIDETypeDefine.ts

@@ -61,7 +61,7 @@ export interface FileItem {
 }
 
 export interface FileGroup {
-    name: string;       // dir name if it's system folder, else it's a virtual path
+    name: string;       // dir name if it's system folder, else it's a virtual path (with '<virtual_root>/' header)
     files: FileItem[];
     disabled?: boolean; // for mdk group info
 }