Merge pull request #78 from github0null/dev

v2.15.1 revision

Author: github0null

CHANGELOG.md

@@ -4,6 +4,23 @@
 
 ***
 
+### [v2.15.1]
+- 新增：支持在**源文件路径**，**烧录选项->程序文件** 中使用**变量**. 暂支持以下变量：
+  - `OutDir`：         输出目录
+  - `ProjectName`：    项目名
+  - `ExecutableName`： 输出的可执行文件路径，不含后缀
+  - `ProjectRoot`：    项目根目录
+  - `项目设置->环境变量` 中的变量（变量名必须只包含字母，数字或下划线）
+- 修复：状态栏 **打开串口命令失效**
+- 修复：sdcc 错误输出高亮匹配失效
+- 优化：使用编辑器右键菜单打开反汇编时，自动根据源文件的当前被选中的 `行` 或者 `标识符`，跳转至相应的反汇编行（没有找到则跳转至开头）
+- 优化：当源文件不在当前工作区时，向 C/C++ 插件提供源文件的搜索目录
+- 优化：打开文件选取对话框时，设置初始路径为项目根目录
+- 优化：在使用 Importer 导入多 Target 项目时，使用 \<prjName>+\<targetName> 作为 id，区分列表项
+- 优化：优化下载 eide-binaries 时的站点选择
+- 优化：若某些烧录器不支持 `Erase Chip`，则忽略该命令
+***
+
 ### [v2.15.0] (**requirements: VsCode ^1.60.0**)
 - 新增：向**项目属性**视图增加一个**修改**按钮，允许以直接修改 yaml 配置文件的形式修改其配置，[文档](https://docs.em-ide.com/#/zh-cn/project_deps)
 - 新增：向**项目资源**视图增加一个配置按钮，允许**为单个的文件或组增加任意编译选项**，支持使用 glob 模式匹配源文件和组，[文档](https://docs.em-ide.com/#/zh-cn/project_manager?id=为源文件附加单独的编译选项)
@@ -28,9 +45,9 @@
 - 优化：项目资源文件夹树排序显示
 - 优化：读取完 JLink Device 列表后，删除临时文件
 - 优化：调整构建工具的 Log 显示
-- 优化 CMSIS Wizard UI：使被禁用的子项表单控件无法被选中
-- 优化 CMSIS Wizard UI：调整布局，优化 vscode 主题颜色适配
-- 优化 完善 CMSIS Wizard 的语法支持程度
+- 优化：CMSIS Wizard UI：使被禁用的子项表单控件无法被选中
+- 优化：CMSIS Wizard UI：调整布局，优化 vscode 主题颜色适配
+- 优化：完善 CMSIS Wizard 的语法支持程度
 ***
 
 ### [v2.14.0]

package.json

@@ -26,8 +26,8 @@
     ],
     "homepage": "https://github.com/github0null/eide/blob/master/README.md",
     "license": "MIT",
-    "description": "A singlechip development environment for 8051/STM8/Cortex-M/RISC-V",
-    "version": "2.15.0",
+    "description": "An embedded development environment for 8051/STM8/Cortex-M/RISC-V",
+    "version": "2.15.1",
     "engines": {
         "vscode": "^1.60.0"
     },
@@ -79,6 +79,7 @@
         "jsonc": "^2.0.0",
         "micromatch": "^4.0.4",
         "unzipper": "^0.10.11",
+        "vscode-cpptools": "^5.0.0",
         "x2js": "3.4.1",
         "yaml": "^1.10.2"
     },

res/data/template.files.options.yml

@@ -1,11 +1,5 @@
-#########################################################################################
-#                append compiler options for files or virtual folders
-#########################################################################################
-
-version: '1.0'
-
-#########################################################################################
-#                                     rules
+##########################################################################################
+#                        Append Compiler Options For Source Files
 #
 # syntax:
 #   <your matcher expr>: <your compiler command>
@@ -19,7 +13,9 @@ version: '1.0'
 #
 # For more syntax, please refer to: https://www.npmjs.com/package/micromatch
 #
-#########################################################################################
+##########################################################################################
+
+version: '1.0'
 
 #
 # for source files with filesystem paths

src/CodeBuilder.ts

@@ -105,7 +105,7 @@ export abstract class CodeBuilder {
         this._event.emit(event, arg);
     }
 
-    genSourceInfo(prevBuilderParams: BuilderParams): {
+    genSourceInfo(prevBuilderParams: BuilderParams | undefined): {
         sources: string[],
         params?: { [name: string]: string; }
         paramsModTime?: number;
@@ -140,8 +140,10 @@ export abstract class CodeBuilder {
                 srcList.forEach((srcInf: any) => {
                     if (!srcInf[fieldName]) return; // skip if not exist
                     for (const expr in parttenInfo) {
-                        const path = (<string>srcInf[fieldName]).replace(/\\/g, '/');
-                        if (globmatch.isMatch(path, expr)) {
+                        const searchPath = (<string>srcInf[fieldName]).replace(/\\/g, '/')
+                            .replace(/\.\.\//g, '')
+                            .replace(/\.\//g, ''); // globmatch bug ? it can't parse path which have '.' or '..'
+                        if (globmatch.isMatch(searchPath, expr)) {
                             const val = parttenInfo[expr]?.trim().replace(/(?:\r\n|\n)$/, '')
                             if (srcParams[srcInf.path]) {
                                 srcParams[srcInf.path] += ` ${val || ''}`
@@ -169,11 +171,13 @@ export abstract class CodeBuilder {
 
                 // if src options is modified to null but old is not null,
                 // we need make source recompile
-                const oldSrcParams = prevBuilderParams.sourceParams;
-                for (const path in oldSrcParams) {
-                    if (srcParams[path] == undefined && oldSrcParams[path] != undefined &&
-                        oldSrcParams[path] != '') {
-                        srcParams[path] = ""; // make it empty to trigger recompile 
+                if (prevBuilderParams) {
+                    const oldSrcParams = prevBuilderParams.sourceParams;
+                    for (const path in oldSrcParams) {
+                        if (srcParams[path] == undefined && oldSrcParams[path] != undefined &&
+                            oldSrcParams[path] != '') {
+                            srcParams[path] = ""; // make it empty to trigger recompile 
+                        }
                     }
                 }
             }
@@ -349,7 +353,7 @@ export abstract class CodeBuilder {
         const memMaxSize = this.getMaxSize();
         const modeList: string[] = [];
         const oldParamsPath = `${paramsPath}.old`;
-        const prevParams: BuilderParams = File.IsFile(oldParamsPath) ? JSON.parse(fs.readFileSync(oldParamsPath, 'utf8')) : {};
+        const prevParams: BuilderParams | undefined = File.IsFile(oldParamsPath) ? JSON.parse(fs.readFileSync(oldParamsPath, 'utf8')) : undefined;
         const sourceInfo = this.genSourceInfo(prevParams);
 
         const builderOptions: BuilderParams = {
@@ -402,7 +406,7 @@ export abstract class CodeBuilder {
         builderOptions.sha = this.genHashFromCompilerOptions(builderOptions);
 
         // check whether need rebuild project
-        if (this.isRebuild() == false) {
+        if (this.isRebuild() == false && prevParams) {
             try {
                 // not found hash from old params file
                 if (prevParams.sha == undefined) {