Merge pull request #134 from github0null/dev

github0null · web-flow · commit 6d74dd9eda2c · 2022-05-29T20:15:09.000+08:00
v3.7.0 update
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,18 @@
 
 ***
 
+### [v3.7.0]
+
+**Change**:
+  - Use [.NET6](https://dotnet.microsoft.com/en-us/download/dotnet/6.0) runtime, not `Mono`.
+  - No longer support `X86 (32Bit)` platform.
+
+**Optimize**:
+  - Remove some discarded extension settings.
+  - Optimize multi-thread build speed.
+
+***
+
 ### [v3.6.4]
 
 **Fixed**:
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 
 ## Summary 📑
 
-> Supported Platforms: **Windows (Windows 7 SP1 and later)**, **Linux x86_64**
+> Supported Platforms: **Windows X64 (>= Windows 10)**, **Linux x64**
 
 A mcu development environment for `8051/AVR/STM8/Cortex-M[0/0+/3/4/7]/RISC-V/Universal-Gcc` on VsCode. 
 
diff --git a/README_ZH-CN.md b/README_ZH-CN.md
@@ -6,7 +6,7 @@
 
 ## 简述 📑
 
-> 受支持的平台: **Windows (Windows 7 SP1 and later)**, **Linux x86_64**
+> 受支持的平台: **Windows X64 (>= Windows 10)**, **Linux x64**
 
 一款适用于 8051/STM8/Cortex-M/RISC-V 的单片机开发环境。
 
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.4",
+    "version": "3.7.0",
     "preview": false,
     "engines": {
         "vscode": "^1.63.0"
@@ -419,12 +419,6 @@
                         "markdownDescription": "%settings.jlink.install.folder%",
                         "default": "${userRoot}/.eide/tools/jlink"
                     },
-                    "EIDE.JLink.DeviceXmlPath": {
-                        "type": "string",
-                        "scope": "machine",
-                        "markdownDescription": "%settings.jlink.device.xml%",
-                        "default": ""
-                    },
                     "EIDE.OpenOCD.ExePath": {
                         "type": "string",
                         "scope": "machine",
diff --git a/res/data/config.yaml b/res/data/config.yaml
@@ -2,4 +2,4 @@
 
 version: '1.0'
 
-binary_min_version: '6.0.0'
+binary_min_version: '7.0.0'
diff --git a/src/CodeBuilder.ts b/src/CodeBuilder.ts
@@ -319,9 +319,10 @@ export abstract class CodeBuilder {
         outDir.CreateDir(true);
 
         // generate command line
-        const cmds = [`${this.getBuilderExe().path}`].concat(this.getCommands());
-        const exeName: string = resManager.getMonoName();
-        const commandLine = CmdLineHandler.getCommandLine(exeName, cmds);
+        const commandLine = CmdLineHandler.getCommandLine(
+            this.getBuilderExe().noSuffixName,
+            this.getCommands()
+        );
 
         return commandLine;
     }
@@ -385,12 +386,12 @@ export abstract class CodeBuilder {
             target: this.project.getCurrentTarget(),
             toolchain: toolchain.name,
             toolchainLocation: toolchain.getToolchainDir().path,
-            toolchainCfgFile: toolchain.modelName,
+            toolchainCfgFile: NodePath.normalize(`../cfg/${toolchain.modelName}`),
             buildMode: 'fast|multhread',
             showRepathOnLog: settingManager.isPrintRelativePathWhenBuild(),
             threadNum: settingManager.getThreadNumber(),
             rootDir: this.project.GetRootDir().path,
-            dumpPath: File.ToLocalPath(this.project.ToRelativePath(dumpDir, false) || dumpDir),
+            dumpPath: File.ToLocalPath(outDir),
             outDir: File.ToLocalPath(outDir),
             ram: memMaxSize?.ram,
             rom: memMaxSize?.rom,
@@ -934,7 +935,7 @@ export class ARMCodeBuilder extends CodeBuilder {
 
                 extraCommands.push({
                     name: 'axf to elf',
-                    command: `mono "\${BuilderFolder}${File.sep}utils${File.sep}axf2elf${exeSuffix()}" -d "${tool_root_folder}" -b "${ouput_path}.bin" -i "${ouput_path}.axf" -o "${ouput_path}.elf" > "${axf2elf_log}"`
+                    command: `axf2elf -d "${tool_root_folder}" -b "${ouput_path}.bin" -i "${ouput_path}.axf" -o "${ouput_path}.elf" > "${axf2elf_log}"`
                 });
             }
 
diff --git a/src/EIDEProjectExplorer.ts b/src/EIDEProjectExplorer.ts
@@ -2429,9 +2429,8 @@ export class ProjectExplorer implements CustomConfigurationProvider {
         paramsFile.Write(JSON.stringify(cmdList));
 
         /* launch */
-        const resManager = ResManager.GetInstance();
-        const cmds = [`${ResManager.GetInstance().getBuilder().path}`].concat(['-r', paramsFile.path]);
-        const commandLine = CmdLineHandler.getCommandLine(resManager.getMonoName(), cmds);
+        const exeName = ResManager.GetInstance().getBuilder().noSuffixName;
+        const commandLine = CmdLineHandler.getCommandLine(exeName, ['-r', paramsFile.path]);
         runShellCommand('build-workspace', commandLine);
     }
 
diff --git a/src/OperationExplorer.ts b/src/OperationExplorer.ts
@@ -237,20 +237,6 @@ export class OperationExplorer {
             }
         });
 
-        icoPath = resManager.GetIconByName('SerialPort_16x.svg');
-        this.provider.AddData({
-            label: view_str$operation$open_serialport,
-            command: {
-                title: view_str$operation$open_serialport,
-                command: '_cl.eide.Operation.OpenSerialPortMonitor'
-            },
-            tooltip: view_str$operation$open_serialport,
-            iconPath: {
-                light: icoPath.path,
-                dark: icoPath.path
-            }
-        });
-
         const tcList: ToolchainName[] = ['AC5', 'GCC', 'IAR_STM8', 'SDCC', 'Keil_C51', 'RISCV_GCC', 'ANY_GCC', 'GNU_SDCC_STM8'];
         const toolchainManager = ToolchainManager.getInstance();
         const checkResults = tcList.map((tcName) => { return toolchainManager.isToolchainPathReady(tcName); });
@@ -1249,8 +1235,9 @@ export class OperationExplorer {
             terminal.show(true);
 
             /* send command */
-            const commandLine = `"${resManager.getSerialPortExe().path}" ${paramList.join(' ')}`;
-            terminal.sendText(`${resManager.getMonoName()} ${commandLine}`);
+            const exeName = resManager.getSerialPortExe().noSuffixName;
+            const cmd = paramList.join(' ');
+            terminal.sendText(`${exeName} ${cmd}`);
 
         } catch (error) {
             GlobalEvent.emit('error', error);
diff --git a/src/ResManager.ts b/src/ResManager.ts
@@ -165,7 +165,7 @@ export class ResManager extends events.EventEmitter {
 
     enumSerialPort(): string[] {
         try {
-            const cmd = `${this.getMonoName()} "${this.getSerialPortExe().path}"`;
+            const cmd = this.getSerialPortExe().noSuffixName;
             const data = ChildProcess.execSync(cmd, { env: process.env });
             const portList: string[] = JSON.parse(CodeConverter.trimUtf8BomHeader(data));
             if (!Array.isArray(portList)) { throw Error("get current port list error !"); }
@@ -383,10 +383,6 @@ export class ResManager extends events.EventEmitter {
         return File.fromArray([this.getBuilderDir().path, 'bin', `serial_monitor${exeSuffix()}`]);
     }
 
-    getMonoName(): string {
-        return 'mono';
-    }
-
     /* --------------- tools -------------------- */
 
     getUtilToolsDir(): string {
@@ -444,9 +440,8 @@ export class ResManager extends events.EventEmitter {
         /* load extension device list */
         try {
 
-            const eideDefFile = SettingManager.GetInstance().getJlinkDevXmlFile();
             const jlinkDefFile = File.fromArray([SettingManager.GetInstance().getJlinkDir(), 'JLinkDevices.xml']);
-            const file = jlinkDevXmlFile || eideDefFile || jlinkDefFile;
+            const file = jlinkDevXmlFile || jlinkDefFile;
 
             if (file && file.IsFile()) {
                 const parser = new x2js({
diff --git a/src/SettingManager.ts b/src/SettingManager.ts
@@ -345,16 +345,6 @@ export class SettingManager {
         return defPath || 'null';
     }
 
-    getJlinkDevXmlFile(): File | undefined {
-        const path = this.getConfiguration().get<string>('JLink.DeviceXmlPath');
-        if (path) {
-            const file = new File(path);
-            if (file.IsFile()) {
-                return file;
-            }
-        }
-    }
-
     getStvpExePath(): string {
         return this.replaceEnvVariable(
             this.getExePathFromConfig('STM8.STVP.CliExePath', 'STVP_CmdLine') || 'null'
@@ -416,7 +406,7 @@ export class SettingManager {
 
     getThreadNumber(): number {
         const num = this.getConfiguration().get<number>('Builder.ThreadNumber') || -1;
-        if (num <= 0) { return os.cpus().length + 2; }
+        if (num <= 0) { return os.cpus().length; }
         return num;
     }
 
diff --git a/src/extension.ts b/src/extension.ts
@@ -343,13 +343,8 @@ async function onSelectCurSerialName() {
 //////////////////////////////////////////////////
 
 function checkBinFolder(binFolder: File): boolean {
-    if (os.platform() == 'win32') {
-        return binFolder.IsDir() &&
-            File.fromArray([binFolder.path, File.ToLocalPath('lib/mono/4.5/mscorlib.dll')]).IsFile();
-    } else {
-        return binFolder.IsDir() &&
-            File.fromArray([binFolder.path, File.ToLocalPath('builder/bin/unify_builder')]).IsFile();
-    }
+    return binFolder.IsDir() &&
+        File.fromArray([binFolder.path, File.ToLocalPath(`builder/bin/unify_builder${platform.exeSuffix()}`)]).IsFile();
 }
 
 async function checkAndInstallBinaries(forceInstall?: boolean): Promise<boolean> {
@@ -664,7 +659,7 @@ function exportEnvToSysPath() {
 
     // export some eide binaries path to system env path
     const defEnvPath: string[] = [
-        builderFolder.path, // builder root folder
+        NodePath.normalize(`${builderFolder.path}/bin`), // builder bin folder
         NodePath.normalize(`${builderFolder.path}/utils`), // utils tool folder
     ];
 
@@ -714,6 +709,101 @@ function exportEnvToSysPath() {
             process.env[env.key] = '';
         }
     }
+
+    // .NET 工具会收集用法数据，帮助我们改善你的体验。它由 Microsoft 收集并与社区共享。
+    // 你可通过使用喜欢的 shell 将 DOTNET_CLI_TELEMETRY_OPTOUT 环境变量设置为 "1" 或 "true" 来选择退出遥测。
+    // 阅读有关 .NET CLI 工具遥测的更多信息: https://aka.ms/dotnet-cli-telemetry
+    process.env['DOTNET_CLI_TELEMETRY_OPTOUT'] = '1'; // disable telemetry
+}
+
+async function checkAndInstallRuntime() {
+
+    //
+    // if not found dotnet, preset dotnet root folder into system env
+    // dotnet path: 'C:\Program Files\dotnet'
+    //
+    if (os.platform() == 'win32') {
+        try {
+            ChildProcess.execSync(`dotnet --info`);
+        } catch (error) {
+            platform.appendToSysEnv(process.env, ['C:\\Program Files\\dotnet']);
+        }
+    }
+
+    //
+    // check or install .NET
+    //
+    try {
+        GlobalEvent.emit('globalLog', newMessage('Info', 'Checking .NET6 Runtime ...'));
+        const dotnetInfo = ChildProcess.execSync(`dotnet --info`).toString().trim();
+        GlobalEvent.emit('globalLog', newMessage('Info', dotnetInfo));
+        if (!/Version: (?:6|7)\./.test(dotnetInfo)) { throw new Error(`Not found .NET6 Runtime`); }
+        GlobalEvent.emit('globalLog', newMessage('Info', '.NET6 Runtime Found !'));
+    } catch (error) {
+
+        GlobalEvent.emit('globalLog', newMessage('Info', 'Not found [.NET6 Runtime](https://dotnet.microsoft.com/en-us/download/dotnet/6.0) !'));
+
+        const msg = `Not found [.NET6 Runtime](https://dotnet.microsoft.com/en-us/download/dotnet/6.0), please install it !`;
+        const sel = await vscode.window.showWarningMessage(msg, `Install Now`);
+        if (!sel) { return } // user canceled
+
+        // for other platform, user need install it manually
+        if (os.platform() != 'win32') {
+            // https://dotnet.microsoft.com/en-us/download/dotnet/scripts
+            utility.openUrl(`https://dotnet.microsoft.com/en-us/download/dotnet/scripts`);
+        }
+
+        // win32, we can auto install it
+        else {
+            const tmpFile = File.fromArray([os.tmpdir(), 'dotnet-runtime-6.0.5-win-x64.exe']);
+
+            try {
+                if (tmpFile.IsFile()) { fs.unlinkSync(tmpFile.path) }
+            } catch (error) {
+                // do nothing
+            }
+
+            const downloadUrl = `https://download.visualstudio.microsoft.com/download/pr/b395fa18-c53b-4f7f-bf91-6b2d3c43fedb/d83a318111da9e15f5ecebfd2d190e89/dotnet-runtime-6.0.5-win-x64.exe`;
+
+            const done = await vscode.window.withProgress({
+                location: vscode.ProgressLocation.Notification,
+                title: 'Downloading .NET6 installer',
+                cancellable: false
+            }, async (progress, token): Promise<boolean> => {
+
+                const res = await utility.downloadFileWithProgress(downloadUrl, tmpFile.name, progress, token);
+
+                if (res instanceof Buffer) {
+                    try {
+                        fs.writeFileSync(tmpFile.path, res);
+                        return true;
+                    } catch (error) {
+                        return false;
+                    }
+                }
+
+                if (res instanceof Error) {
+                    GlobalEvent.emit('error', res);
+                }
+
+                return false;
+            });
+
+            if (done && tmpFile.IsFile()) {
+                try {
+                    ChildProcess.execFileSync(tmpFile.path);
+                    vscode.window.showInformationMessage(`Good ! Now you need close all VsCode instances and relaunch it !`);
+                } catch (error) {
+                    GlobalEvent.emit('msg', newMessage('Error', `Install [.NET6 runtime](https://dotnet.microsoft.com/en-us/download/dotnet/6.0) failed, you need install it manually !`));
+                }
+            } else {
+                vscode.window.showWarningMessage(`Install .NET6 failed, you need install it manually !`);
+                // https://dotnet.microsoft.com/en-us/download/dotnet/scripts
+                // https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-6.0.5-windows-x64-installer
+                utility.openUrl(`https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-6.0.5-windows-x64-installer`);
+            }
+        }
+    }
 }
 
 async function InitComponents(context: vscode.ExtensionContext): Promise<boolean | undefined> {
@@ -727,7 +817,7 @@ async function InitComponents(context: vscode.ExtensionContext): Promise<boolean
         try {
             ChildProcess.execSync(`chmod +x "${resManager.Get7za().path}"`);
         } catch (error) {
-            GlobalEvent.emit('msg', ExceptionToMessage(error, 'Hidden'));
+            GlobalEvent.emit('msg', ExceptionToMessage(error, 'Error'));
         }
     }
 
@@ -737,31 +827,41 @@ async function InitComponents(context: vscode.ExtensionContext): Promise<boolean
 
     // chmod +x for other executable files
     if (os.platform() != 'win32') {
+
         const exeLi: string[] = [
-            `${[resManager.GetBinDir().path, 'scripts', 'qjs'].join(File.sep)}`,
-            `${[resManager.getBuilderDir().path, 'utils', 'hex2bin'].join(File.sep)}`
+            `${[resManager.GetBinDir().path, 'scripts', 'qjs'].join(File.sep)}`
         ];
+
+        // get exe file list from 'utils' folder
+        File.fromArray([resManager.getBuilderDir().path, 'utils'])
+            .GetList(undefined, File.EMPTY_FILTER)
+            .forEach((f) => {
+                if (!f.suffix) { // nosuffix file is an exe file
+                    exeLi.push(f.path);
+                }
+            });
+
+        // get exe file list from 'bin' folder
+        File.fromArray([resManager.getBuilderDir().path, 'bin'])
+            .GetList(undefined, File.EMPTY_FILTER)
+            .forEach((f) => {
+                if (!f.suffix) { // nosuffix file is an exe file
+                    exeLi.push(f.path);
+                }
+            });
+
         for (const path of exeLi) {
             try {
                 ChildProcess.execSync(`chmod +x "${path}"`);
+                GlobalEvent.emit('globalLog', newMessage('Info', `chmod +x "${path}"`));
             } catch (error) {
-                GlobalEvent.emit('msg', ExceptionToMessage(error, 'Hidden'));
+                GlobalEvent.emit('msg', ExceptionToMessage(error, 'Error'));
             }
         }
     }
 
-    // check mono runtime
-    if (os.platform() != 'win32') {
-        try {
-            ChildProcess.execSync(`mono --version`).toString();
-        } catch (error) {
-            const sel = await vscode.window.showWarningMessage(`Not found [Mono](https://www.mono-project.com/) runtime, please install it !`, `Install`);
-            if (sel) {
-                // https://www.mono-project.com/download/stable/#download-lin
-                utility.openUrl(`https://www.mono-project.com/download/stable/#download-lin`);
-            }
-        }
-    }
+    // check and install .NET6 runtime
+    await checkAndInstallRuntime();
 
     // register telemetry hook if user enabled
     try {

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`version: '1.0'`
`4`	`4`
`5`		`-binary_min_version: '6.0.0'`
	`5`	`+binary_min_version: '7.0.0'`