Merge pull request #169 from github0null/dev

v3.9.1 revision

Author: github0null

CHANGELOG.md

@@ -6,6 +6,29 @@ All notable version changes will be recorded in this file.
 
 ***
 
+### [v3.9.1] revision (v3.9.2022092001 preview)
+
+**Fix**:
+  - Env was overrided when import a 'multi-project' iar workspace
+  - Sdcc problem matcher doesn't work
+  - Error path convert: '${VAR}/../path/dir' -> 'path/dir' when use `NodeJs.normalize()`, use `File.normalize` replace `NodeJs.normalize()`
+  - Source file is not compiled when their reference were updated (unify_builder)
+
+**Change**:
+  - Remove Makefile template file generate
+
+**Optimize**:
+  - Export built-in env variables to unify_builder
+  - Export more env variables to builder process envirnoment
+  - Resolve recursive vars when parse iar eww file
+  - When import a iar project, create new folder if iar project not have independent folder
+  - Reload jlink device list after install a cmsis device package
+  - Add '${OutDirRoot}' var
+  - Auto convert '\' to '/' when use `bash` command in builder task for win32
+  - Update built-in msys version to `v1.0.18`
+
+***
+
 ### [v3.9.0]
 
 **New**:

lib/node-utility

@@ -34,7 +34,7 @@
     "homepage": "https://em-ide.com",
     "license": "MIT",
     "description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/RISC-V",
-    "version": "3.9.0",
+    "version": "3.9.1",
     "preview": false,
     "engines": {
         "vscode": "^1.63.0"
@@ -549,6 +549,11 @@
                 "category": "eide",
                 "title": "%eide.function.reinstall.binaries%"
             },
+            {
+                "command": "eide.create.clang-format.file",
+                "category": "eide",
+                "title": "Create a new .clang-format template file"
+            },
             {
                 "command": "_cl.eide.workspace.build",
                 "title": "%eide.workspace.build%",
@@ -743,10 +748,6 @@
                 "command": "_cl.eide.project.showBuildParams",
                 "title": "%eide.project.show.commands%"
             },
-            {
-                "command": "_cl.eide.project.generate.makefile",
-                "title": "%eide.project.gen.makefile%"
-            },
             {
                 "command": "_cl.eide.project.installCMSISHeaders",
                 "title": "%eide.package.install.cmsis%",
@@ -1253,10 +1254,6 @@
                     "command": "_cl.eide.project.showBuildParams",
                     "when": "viewItem == SOLUTION && view == Project"
                 },
-                {
-                    "command": "_cl.eide.project.generate.makefile",
-                    "when": "viewItem == SOLUTION && view == Project"
-                },
                 {
                     "command": "eide.project.uploadToDevice",
                     "when": "viewItem == SOLUTION && view == Project"

package.json

@@ -35,4 +35,4 @@ SortIncludes: false
 
 AlignConsecutiveMacros: AcrossEmptyLines
 
-AlignConsecutiveAssignments: AcrossEmptyLines
+#AlignConsecutiveAssignments: AcrossEmptyLines

res/data/.clang-format

@@ -2,4 +2,4 @@
 
 version: '1.0'
 
-binary_min_version: '9.0.0'
+binary_min_version: '10.0.0'

res/data/config.yaml

@@ -402,7 +402,7 @@ export abstract class CodeBuilder {
             target: this.project.getCurrentTarget(),
             toolchain: toolchain.name,
             toolchainLocation: toolchain.getToolchainDir().path,
-            toolchainCfgFile: NodePath.normalize(`../cfg/${toolchain.modelName}`),
+            toolchainCfgFile: File.normalize(`../cfg/${toolchain.modelName}`),
             buildMode: 'fast|multhread',
             showRepathOnLog: settingManager.isPrintRelativePathWhenBuild(),
             threadNum: settingManager.getThreadNumber(),
@@ -418,7 +418,7 @@ export abstract class CodeBuilder {
             sourceParams: sourceInfo.params,
             sourceParamsMtime: sourceInfo.paramsModTime,
             options: JSON.parse(JSON.stringify(compileOptions)),
-            env: this.project.getProjectEnv()
+            env: this.project.getProjectVariables()
         };
 
         // set ram size from env

src/CodeBuilder.ts

@@ -63,7 +63,7 @@ export class DependenceManager implements ManagerInterface {
     Init() {
         const rootDir = this.project.GetRootDir();
         this.prjType = this.project.GetConfiguration().config.type;
-        this.depDir = File.fromArray([rootDir.path, NodePath.normalize(DependenceManager.DEPENDENCE_DIR)]);
+        this.depDir = File.fromArray([rootDir.path, File.normalize(DependenceManager.DEPENDENCE_DIR)]);
         this.LoadComponents();
     }