Merge pull request #256 from github0null/dev

v3.13.0 update

Author: github0null

CHANGELOG.md

@@ -6,6 +6,30 @@ All notable version changes will be recorded in this file.
 
 ***
 
+### [v3.13.0] update
+
+**New**:
+  - `MIPS Project`: Support new project type `MIPS` and new toolchain `MTI GCC`, thanks [@eatradish](https://github.com/eatradish).
+  - `Status Bar`: Add status bar for project target switch.
+  - `STM8 MapView`: Support MapView for COSMIC-STM8 Compiler.
+
+**Fix**:
+  - `Switch Target`: Not copy source options file if it's not existed when switch target.
+  - `Cpptools Intellisense`: Notify cpptools update source config after active project changed.
+
+**Change**:
+  - `IAR Arm Toolchain`: Remove auto-gen '-I' include options for iar arm assembler.
+
+**Optimize**:
+  - `COSMIC_STM8`: Auto generate `.d` files for COSMIC_STM8.
+  - `KeilC51 Importer`: Setup 'CClasses, UserClasses' when import a keilc51 project.
+  - `System Variables`: Add some system variables, like: `${SYS_Platform}, ${SYS_DirSep} ...`
+  - `Auto Save`: Compare content before save project.
+  - `Source Folder`: Need to confirm before remove src folder.
+  - `IAR Toolchain`: Add more cpu list for selection.
+
+***
+
 ### [v3.12.2023052101] revision
 
 **New**:

package.json

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

src/CodeBuilder.ts

@@ -50,7 +50,6 @@ import { DependenceManager } from "./DependenceManager";
 import { WorkspaceManager } from "./WorkspaceManager";
 import { ToolchainName } from "./ToolchainManager";
 import { md5, sha256, copyObject } from "./utility";
-import { MakefileGen } from "./Makefile";
 import { exeSuffix, osType } from "./Platform";
 import { FileWatcher } from "../lib/node-utility/FileWatcher";
 import { STVPFlasherOptions } from './HexUploader';
@@ -535,16 +534,6 @@ export abstract class CodeBuilder {
         // write project build params
         fs.writeFileSync(paramsPath, JSON.stringify(builderOptions, undefined, 4));
 
-        // generate makefile params
-        if (settingManager.isGenerateMakefileParams()) {
-            try {
-                const gen = new MakefileGen();
-                gen.generateParamsToFile(builderOptions, this.project.ToAbsolutePath(config.outDir));
-            } catch (error) {
-                GlobalEvent.emit('msg', ExceptionToMessage(error, 'Hidden'));
-            }
-        }
-
         let cmds = [
             '-p', paramsPath,
         ];

src/EIDEProject.ts

@@ -2668,76 +2668,74 @@ class EIDEProject extends AbstractProject {
 
     private srcRefMap: Map<string, File[]> = new Map();
 
-    public async notifyUpdateSourceRefs(toolchain_: ToolchainName | undefined): Promise<boolean> {
+    public async notifyUpdateSourceRefs(toolchain_: ToolchainName | undefined) {
 
-        return new Promise((resolve) => {
-
-            /* clear old */
-            this.srcRefMap.clear();
+        /* clear old */
+        this.srcRefMap.clear();
 
-            /* check source references is enabled ? */
-            if (!SettingManager.GetInstance().isDisplaySourceRefs()) {
-                resolve(false);
-                return; /* no refs list file, exit */
-            }
+        /* check source references is enabled ? */
+        if (!SettingManager.GetInstance().isDisplaySourceRefs()) {
+            return;
+        }
 
-            let compiler_cmd_db: CompilerCommandsDatabaseItem[] = [];
-            let generate_dep_file: ((cmd_db: CompilerCommandsDatabaseItem[], srcpath: string, deppath: string) => void) | undefined;
+        let compiler_cmd_db: CompilerCommandsDatabaseItem[] = [];
+        let generate_dep_file: ((cmd_db: CompilerCommandsDatabaseItem[], srcpath: string, deppath: string) => Promise<void>) | undefined;
 
-            // for COSMIC STM8, we need manual generate .d files
+        // for COSMIC STM8, we need manual generate .d files
+        try {
             if (this.getToolchain().name == 'COSMIC_STM8') {
                 const compilerDBFile = File.fromArray([this.getOutputFolder().path, 'compile_commands.json']);
                 if (compilerDBFile.IsFile()) {
-                    try {
-                        compiler_cmd_db = jsonc.parse(compilerDBFile.Read());
-                        generate_dep_file = (cmd_db: CompilerCommandsDatabaseItem[], srcpath: string, deppath: string) => {
+                    compiler_cmd_db = jsonc.parse(compilerDBFile.Read());
+                    generate_dep_file = (cmd_db: CompilerCommandsDatabaseItem[], srcpath: string, deppath: string): Promise<void> => {
+                        return new Promise((resolve) => {
                             let idx = cmd_db.findIndex((e) => e.file == srcpath);
-                            if (idx != -1) {
-                                try {
-                                    let cmd_item = cmd_db[idx];
-                                    let command = cmd_item.command.replace('-co', '-sm -co');
-                                    const depcont = child_process.execSync(command, { cwd: cmd_item.directory }).toString();
-                                    fs.writeFileSync(deppath, depcont);
-                                } catch (error) {
-                                    GlobalEvent.emit('globalLog', newMessage('Warning', `Failed to make '${deppath}', msg: ${(<Error>error).message}`));
+                            if (idx == -1) { resolve(); return; }
+                            let cmd_item = cmd_db[idx];
+                            let command = cmd_item.command.replace('-co', '-sm -co');
+                            child_process.exec(command, { cwd: cmd_item.directory }, (error: child_process.ExecException | null, stdout: string, stderr: string) => {
+                                if (error) {
+                                    const msg = `Failed to make '${deppath}', msg: ${(<Error>error).message}`;
+                                    GlobalEvent.emit('globalLog', newMessage('Warning', msg));
                                     try { fs.unlinkSync(deppath) } catch (error) { } // del old .d file
+                                    resolve();
+                                } else {
+                                    fs.writeFileSync(deppath, stdout);
+                                    resolve();
                                 }
-                            }
-                        };
-                    } catch (error) {
-                        GlobalEvent.emit('globalLog', ExceptionToMessage(error, 'Warning'));
-                    }
+                            });
+                        });
+                    };
                 }
             }
+        } catch (error) {
+            GlobalEvent.emit('globalLog', ExceptionToMessage(error, 'Warning'));
+        }
 
-            const toolName = toolchain_ || this.getToolchain().name;
+        const toolName = toolchain_ || this.getToolchain().name;
 
-            const outFolder = this.getOutputFolder();
-            const refListFile = File.fromArray([outFolder.path, 'ref.json']);
+        const outFolder = this.getOutputFolder();
+        const refListFile = File.fromArray([outFolder.path, 'ref.json']);
 
-            if (!refListFile.IsFile()) {
-                resolve(false);
-                return; /* no refs list file, exit */
-            }
+        if (!refListFile.IsFile()) {
+            return; /* no refs list file, exit */
+        }
 
-            try {
-                const refMap = JSON.parse(refListFile.Read());
-                for (const srcpath in refMap) {
-                    const refFile = new File((<string>refMap[srcpath]).replace(/\.[^\\\/\.]+$/, '.d'));
-                    if (generate_dep_file) generate_dep_file(compiler_cmd_db, srcpath, refFile.path);
-                    if (!refFile.IsFile()) continue;
-                    const refs = this.parseRefFile(refFile, toolName).filter(p => p != srcpath);
-                    this.srcRefMap.set(srcpath, refs.map((path) => new File(path)));
-                }
-            } catch (error) {
-                GlobalEvent.emit('msg', ExceptionToMessage(error, 'Hidden'));
+        try {
+            const refMap = JSON.parse(refListFile.Read());
+            for (const srcpath in refMap) {
+                const refFile = new File((<string>refMap[srcpath]).replace(/\.[^\\\/\.]+$/, '.d'));
+                if (generate_dep_file) await generate_dep_file(compiler_cmd_db, srcpath, refFile.path);
+                if (!refFile.IsFile()) continue;
+                const refs = this.parseRefFile(refFile, toolName).filter(p => p != srcpath);
+                this.srcRefMap.set(srcpath, refs.map((path) => new File(path)));
             }
+        } catch (error) {
+            GlobalEvent.emit('globalLog', ExceptionToMessage(error, 'Warning'));
+        }
 
-            // notify update src view
-            this.emit('dataChanged', 'files');
-
-            resolve(true);
-        });
+        // notify update src view
+        this.emit('dataChanged', 'files');
     }
 
     public getSourceRefs(file: File): File[] {