Merge pull request #204 from github0null/dev

v3.10.10 revision

Author: github0null

.gitignore

@@ -1,7 +1,6 @@
 /node_modules
 /out
 /out.min
-src/Telemetry/
 vsc-extension-quickstart.md
 *.vsix
 .EIDE
@@ -12,11 +11,18 @@ vsc-extension-quickstart.md
 pack.js
 test.js
 *.js.map
-**/data/config.json
-**/data/sln.record
 *.cpuprofile
 package-lock.json
 
+# private
+/src/Telemetry
+/src/Private
+
+# eide vars
+/res/data/config.json
+/res/data/sln.record
+/res/data/data.yaml
+
 # internal template projects
 res/template/projects
 

CHANGELOG.md

@@ -6,6 +6,22 @@ All notable version changes will be recorded in this file.
 
 ***
 
+### [v3.10.10] revision
+
+**New**:
+  - `Project Explorer`: Lock opened project.
+  - `Environment Variables View`: Allow show all available variables.
+
+**Fix**:
+  - `Symbol View`: Not found elf path when use IAR ARM toolchain.
+
+**Optimize**:
+  - `Environment Variables`: Allow use 'K, M, G' in 'MCU_RAM_SIZE', 'MCU_ROM_SIZE' variables.
+  - `CMSIS Config Wizard`: Use workspace encoding for cmsis config wizard.
+  - `Github Proxy`: Optimize proxy, enable proxy for 'GMT+8:00' timezone by default.
+
+***
+
 ### [v3.10.9] update
 
 **New**:

lib/node-utility

@@ -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.10.9",
+    "version": "3.10.10",
     "preview": false,
     "engines": {
         "vscode": "^1.67.0"
@@ -97,8 +97,10 @@
         "iconv-lite": "^0.5.0",
         "ini": "^2.0.0",
         "jsonc": "^2.0.0",
+        "mathjs": "^11.5.0",
         "micromatch": "^4.0.4",
         "node-7z": "^3.0.0",
+        "table": "^6.8.1",
         "vscode-cpptools": "^5.0.0",
         "x2js": "3.4.1",
         "xml-formatter": "^2.6.1",
@@ -559,6 +561,10 @@
                 "category": "eide",
                 "title": "Create a new .clang-format template file"
             },
+            {
+                "command": "_cl.eide.project.show_proj_vars",
+                "title": "%eide.project.show_project_vars%"
+            },
             {
                 "command": "_cl.eide.workspace.build",
                 "title": "%eide.workspace.build%",
@@ -1324,6 +1330,10 @@
                     "command": "_cl.eide.project.close",
                     "when": "viewItem == SOLUTION && view == cl.eide.view.projects"
                 },
+                {
+                    "command": "_cl.eide.project.show_proj_vars",
+                    "when": "viewItem == SOLUTION && view == cl.eide.view.projects"
+                },
                 {
                     "command": "_cl.eide.project.excludeSource",
                     "group": "inline",

package.json

@@ -12,6 +12,7 @@
     "eide.function.reload.stm8.dev.list": "Reload STM8 Devices List",
     "eide.function.reinstall.binaries": "Reinstall eide binaries",
 
+    "eide.project.show_project_vars": "Show All Project Variables",
     "eide.project.save": "Save Project",
     "eide.project.refresh": "Refresh",
     "eide.project.save.all": "Save All Projects",

package.nls.json

@@ -12,6 +12,7 @@
     "eide.function.reload.stm8.dev.list": "重新加载 STM8 芯片信息列表",
     "eide.function.reinstall.binaries": "重新安装 eide binaries",
 
+    "eide.project.show_project_vars": "显示所有可用的项目变量",
     "eide.project.save": "保存项目",
     "eide.project.refresh": "刷新",
     "eide.project.save.all": "保存所有项目",

package.nls.zh-CN.json

@@ -29,6 +29,7 @@ import * as events from 'events';
 import * as globmatch from 'micromatch'
 import * as os from 'os';
 import * as child_process from 'child_process';
+import * as mathjs from 'mathjs';
 
 import { AbstractProject, VirtualSource } from "./EIDEProject";
 import { ResManager } from "./ResManager";
@@ -425,14 +426,46 @@ export abstract class CodeBuilder {
         if (builderOptions.ram == undefined &&
             builderOptions.env &&
             builderOptions.env['MCU_RAM_SIZE']) {
-            builderOptions.ram = parseInt(builderOptions.env['MCU_RAM_SIZE']) || undefined;
+
+            const expr = (<string>builderOptions.env['MCU_RAM_SIZE']);
+            const expr_args = {
+                B: 1,
+                K: 1024,
+                M: 1024 * 1024,
+                G: 1024 * 1024 * 1024
+            };
+
+            try {
+                builderOptions.ram = mathjs.evaluate(expr, expr_args) as number || undefined;
+            } catch (error) {
+                // nothing todo
+            }
+
+            if (builderOptions.ram && builderOptions.ram <= 0)
+                builderOptions.ram = undefined;
         }
 
         // set rom size from env
         if (builderOptions.rom == undefined &&
             builderOptions.env &&
             builderOptions.env['MCU_ROM_SIZE']) {
-            builderOptions.rom = parseInt(builderOptions.env['MCU_ROM_SIZE']) || undefined;
+
+            const expr = (<string>builderOptions.env['MCU_ROM_SIZE']);
+            const expr_args = {
+                B: 1,
+                K: 1024,
+                M: 1024 * 1024,
+                G: 1024 * 1024 * 1024
+            };
+
+            try {
+                builderOptions.rom = mathjs.evaluate(expr, expr_args) as number || undefined;
+            } catch (error) {
+                // nothing todo
+            }
+
+            if (builderOptions.rom && builderOptions.rom <= 0)
+                builderOptions.rom = undefined;
         }
 
         // handle options by toolchain

src/CodeBuilder.ts

@@ -59,14 +59,16 @@ import { md5, copyObject, compareVersion } from './utility';
 import { ResInstaller } from './ResInstaller';
 import {
     view_str$prompt$not_found_compiler, view_str$operation$name_can_not_be_blank,
-    view_str$operation$name_can_not_have_invalid_char
+    view_str$operation$name_can_not_have_invalid_char,
+    view_str$prompt$project_is_opened_by_another,
 } from './StringTable';
 import { SettingManager } from './SettingManager';
 import { ExeCmd } from '../lib/node-utility/Executable';
 import { jsonc } from 'jsonc';
 import * as iconv from 'iconv-lite';
 import * as globmatch from 'micromatch'
 import { ICompileOptions, EventData, CurrentDevice, ArmBaseCompileConfigModel } from './EIDEProjectModules';
+import * as FileLock from '../lib/node-utility/FileLock';
 
 export class CheckError extends Error {
 }
@@ -807,6 +809,8 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
 
     private builtinEnvVars: { [key: string]: () => string } = {};
 
+    private lock_handle: number | undefined;
+
     ////////////////////////////////// cpptools provider interface ///////////////////////////////////
 
     name: string = 'eide';
@@ -1177,7 +1181,7 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
     /**
      * get output dir top root name. like: `build`
     */
-     getOutputRoot(): string {
+    getOutputRoot(): string {
         return this.GetConfiguration().getOutDirRoot();
     }
 
@@ -1265,6 +1269,12 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
     }
 
     async Load(wsFile: File) {
+
+        this.lock_handle = FileLock.lock([os.tmpdir(), `${md5(wsFile.path)}.lock`].join(NodePath.sep));
+        if (this.lock_handle == undefined) {
+            throw new Error(view_str$prompt$project_is_opened_by_another.replace('{path}', wsFile.path));
+        }
+
         await this.BeforeLoad(wsFile);
         this.LoadConfigurations(wsFile);
         this.loadProjectDirectory();
@@ -1278,6 +1288,7 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
     }
 
     Close() {
+        if (this.lock_handle) FileLock.unlock(this.lock_handle);
         this.sourceRoots.DisposeAll();
         this.configMap.Dispose();
         this.eideDirWatcher?.Close();