v3.23.9 revision

v3.23.9 revision

Author: github0null

CHANGELOG.md

@@ -6,7 +6,7 @@ All notable version changes will be recorded in this file.
 
 ***
 
-### [v3.23.8] revision
+### [v3.23.9] revision
 
 **Improve**:
   - `GNU Arm Toolchain`: Support new mcpu: `cortex-m52, cortex-m55, cortex-m85`.
@@ -16,6 +16,14 @@ All notable version changes will be recorded in this file.
   - `File Options GUI`: Update the translation text. Optimize layout.
   - `DebugConfig Generator GUI`: Change gui element width. Sort the option result list.
 
+**Fix**:
+  - `IAR ARM Toolchain`: Miss auto-gen `-I` params for iar assembler.
+  - `Keil Project Import`: Force use ';' as the path delimiter on unix and windows.
+  - `Eclipse Project Import`: Incorrect project type was detected.
+
+**Change**:
+  - `EIDE View Container`: By default, we will collapse the `Operations` view.
+
 ***
 
 ### [v3.23.6] revision

package.json

@@ -36,7 +36,7 @@
     "homepage": "https://em-ide.com",
     "license": "MIT",
     "description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/MIPS/RISC-V",
-    "version": "3.23.8",
+    "version": "3.23.9",
     "preview": false,
     "engines": {
         "vscode": "^1.67.0"
@@ -529,7 +529,8 @@
                 },
                 {
                     "id": "cl.eide.view.operations",
-                    "name": "%eide.bar.operations%"
+                    "name": "%eide.bar.operations%",
+                    "visibility": "collapsed"
                 }
             ]
         },

res/data/models/arm.iar.model.json

@@ -359,6 +359,9 @@
                 "useFile": true,
                 "body": "-f ${value}"
             },
+            "$includes": {
+                "body": "-I${value}"
+            },
             "$output": "-o ${out} ${in}",
             "$default": [
 				"-S",

src/CodeBuilder.ts

@@ -55,6 +55,7 @@ import { exeSuffix, osType } from "./Platform";
 import { FileWatcher } from "../lib/node-utility/FileWatcher";
 import { STVPFlasherOptions } from './HexUploader';
 import * as ArmCpuUtils from './ArmCpuUtils';
+import { view_str$gen_sct_failed } from './StringTable';
 
 export interface BuildOptions {
 
@@ -658,7 +659,7 @@ export class ARMCodeBuilder extends CodeBuilder {
                     index = storageLayout.RAM[i].id - 1;
                     break;
                 default:
-                    throw Error('Unknown RAM Tag !');
+                    throw Error(`${view_str$gen_sct_failed}: Unknown RAM Tag !`);
             }
 
             memScatter.ramList[index].memInfo = storageLayout.RAM[i].mem;
@@ -679,7 +680,7 @@ export class ARMCodeBuilder extends CodeBuilder {
                     index = storageLayout.ROM[i].id - 1;
                     break;
                 default:
-                    throw Error('Unknown ROM Tag !');
+                    throw Error(`${view_str$gen_sct_failed}: Unknown ROM Tag !`);
             }
 
             memScatter.romList[index].memInfo = storageLayout.ROM[i].mem;
@@ -691,10 +692,10 @@ export class ARMCodeBuilder extends CodeBuilder {
         }
 
         if (memScatter.startUpIndex === -1) {
-            throw Error('MemScatter.startupIndex can\'t be -1');
+            throw Error(`${view_str$gen_sct_failed}: MemScatter.startupIndex can't be -1`);
         }
         else if (!memScatter.romList[memScatter.startUpIndex].selected) {
-            throw Error('the IROM' + (memScatter.startUpIndex - 2).toString() + ' is a startup ROM but it is not selected !');
+            throw Error(`${view_str$gen_sct_failed}: The IROM' + (memScatter.startUpIndex - 2).toString() + ' is a startup ROM but it is not selected !`);
         }
 
         return memScatter;
@@ -1046,8 +1047,12 @@ export class ARMCodeBuilder extends CodeBuilder {
                                 ldFileList.push(this.convLinkerScriptPathForCompiler(sctPath));
                             });
                     } else { // auto generate scatter file
-                        const sctPath = this.GenMemScatterFile(config).path;
-                        ldFileList.push(this.convLinkerScriptPathForCompiler(sctPath));
+                        try {
+                            const sctPath = this.GenMemScatterFile(config).path;
+                            ldFileList.push(this.convLinkerScriptPathForCompiler(sctPath));
+                        } catch (error) {
+                            GlobalEvent.emit('error', error);
+                        }
                     }
                 }
                 break;

src/EclipseProjectParser.ts

@@ -569,17 +569,21 @@ function toArray(obj: any): any[] {
 
 function detectProjectType(toolChain: any): EclipseProjectType | undefined {
 
-    const toolName = toolChain.$['name'];
+    const toolId   = toolChain.$['id'];
+    const toolName = toolChain.$['name'] || toolId;
 
-    if (/\bARM\b/i.test(toolName)) {
+    // <toolChain id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.elf.debug.1201710416" name="ARM Cross GCC"
+    if (/\bARM\b/.test(toolName) || /gnuarmeclipse/.test(toolId)) {
         return 'arm';
     }
 
-    if (/\b(RISCV|RISC-V)\b/i.test(toolName)) {
+    // <toolChain id="ilg.gnumcueclipse.managedbuild.cross.riscv.toolchain.elf.release.231146001" name="RISC-V Cross GCC…
+    if (/\b(RISCV|RISC-V)\b/.test(toolName) || /\.riscv\./.test(toolId)) {
         return 'riscv';
     }
 
-    if (/\bSDCC\b/i.test(toolName)) {
+    // <toolChain errorParsers="" id="cdt.managedbuild.toolchain.sdcc.exe.release.1956586716" name="SDCC Tool Chain" 
+    if (/\bSDCC\b/.test(toolName) || /\.sdcc\./.test(toolId)) {
         return 'sdcc';
     }
 }

src/KeilXmlParser.ts

@@ -131,7 +131,7 @@ export abstract class KeilParser<T> {
 
     protected parseIncludePaths(str: string): string[] {
         if (typeof str !== 'string') return [];
-        return this._splitPathSeparator(str, new RegExp(File.delimiter + '\\s*'))
+        return this._splitPathSeparator(str, /;\s*/)
             .map<string>((path) => this.ToAbsolutePath(path));
     }
 
@@ -538,7 +538,7 @@ class C51Parser extends KeilParser<KeilC51Option> {
         target.TargetOption.Target51.C51.VariousControls.IncludePath = mergedDep.incList
             .map(s => prj.resolveEnvVar(s))
             .map(inc => File.ToLocalPath(prj.toRelativePath(inc)))
-            .join(File.delimiter);
+            .join(';');
 
         target.TargetOption.Target51.C51.VariousControls.Define = mergedDep.defineList.join(",");
 
@@ -1362,7 +1362,7 @@ class ARMParser extends KeilParser<KeilARMOption> {
         target.TargetOption.TargetArmAds.Cads.VariousControls.IncludePath = mergedDep.incList
             .map(s => prj.resolveEnvVar(s))
             .map(inc => File.ToLocalPath(prj.toRelativePath(inc)))
-            .join(File.delimiter);
+            .join(';');
 
         target.TargetOption.TargetArmAds.Cads.VariousControls.Define = mergedDep.defineList.join(","); // C/CPP
         target.TargetOption.TargetArmAds.Aads.VariousControls.Define = mergedDep.defineList.join(","); // ASM

src/StringTable.ts

@@ -424,6 +424,11 @@ export const view_str$env_desc$compiler_folder = [
 
 //---------------Other---------------
 
+export const view_str$gen_sct_failed = [
+    `生成.sct文件失败`,
+    `Fail to generate .sct file`
+][langIndex];
+
 export const view_str$virual_doc_provider_banner = [
     `通过修改并保存这个文件来更新项目配置（注意这个文件是临时的，不要使用其他工具打开这个文件）`,
     `You can modify the configuration by editing and saving this file.`