[update] v2.12.0

github0null · github0null · commit b34711128b3c · 2021-08-06T17:27:33.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,10 +4,18 @@
 
 ***
 
-### [v2.11.1]
+### [v2.12.0]
+- 新增：在设置工具链路径时，支持显式选择工具链的安装模式（仅支持免费的工具链）
+- 新增：增加 vscode 演示，将在插件被安装时启动
+- 修复：修复 cmsis pack 解析问题：https://discuss.em-ide.com/d/87
+- 更改：将 cmsis pack 的默认安装位置改为：`.pack`, cmsis header 的安装位置改为：`.cmsis`
+- 更改：将扩展改为扩展包，一并安装其他实用性扩展
 - 更改：将插件改为在线安装，缩小 vsix 安装包大小，离线版下载位置：https://github.com/github0null/eide/releases
-- 优化：优化**构建器选项** 的 UI，适应 vscode 语言配置
-- 优化：安装 CMSIS Pack 的组件时对文件进行过滤
+- 优化：能够自动在环境变量中获取 Keil 的安装位置，Keil 环境变量：`Keil_Root`
+- 优化：增强 MDK 项目的导入功能，自动导入 MDK 项目中的包组件，增加组件缺失时的提示功能；导入成功后，组件存放位置：`.cmsis`
+- 优化：优化构建器选项的 UI，适应 vscode 语言配置
+- 优化：在插件启动后自动将 cortex-debug 需要的路径设置到插件环境变量
+- 优化：安装 cmsis pack 的组件时对不需要的模板文件进行过滤
 - 优化：新增插件设置，允许禁用相关的右键上下文菜单
 ***
 
diff --git a/img/open_docs.png b/img/open_docs.png
diff --git a/img/setup_toochain.png b/img/setup_toochain.png
diff --git a/img/start_project.png b/img/start_project.png
diff --git a/lang/arm.gcc.verify.json b/lang/arm.gcc.verify.json
@@ -255,6 +255,16 @@
             "description.zh-cn": "汇编器选项",
             "type": "object",
             "properties": {
+                "defines": {
+                    "readable_name": "Macro Defines",
+                    "readable_name.zh-cn": "宏定义",
+                    "markdownDescription": "Macro Defines",
+                    "description.zh-cn": "宏定义",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
                 "ASM_FLAGS": {
                     "markdownDescription": "Other Assembler Options",
                     "description.zh-cn": "汇编器附加选项",
diff --git a/lang/arm.v5.verify.json b/lang/arm.v5.verify.json
@@ -301,6 +301,16 @@
             "description.zh-cn": "汇编器选项",
             "type": "object",
             "properties": {
+                "defines": {
+                    "readable_name": "Macro Defines",
+                    "readable_name.zh-cn": "宏定义",
+                    "markdownDescription": "Macro Defines (format: \"<key> SETA <value>\")",
+                    "description.zh-cn": "宏定义（格式：\"<key> SETA <value>\"）",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
                 "split-load-and-store-multiple": {
                     "markdownDescription": "Split Load and Store Multiple",
                     "type": "boolean",
diff --git a/lang/arm.v6.verify.json b/lang/arm.v6.verify.json
@@ -266,6 +266,16 @@
             "description.zh-cn": "汇编器选项",
             "type": "object",
             "properties": {
+                "defines": {
+                    "readable_name": "Macro Defines",
+                    "readable_name.zh-cn": "宏定义",
+                    "markdownDescription": "Macro Defines",
+                    "description.zh-cn": "宏定义",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
                 "$use": {
                     "markdownDescription": "Assember Type",
                     "description.zh-cn": "汇编器类型",
diff --git a/lang/riscv.gcc.verify.json b/lang/riscv.gcc.verify.json
@@ -265,6 +265,16 @@
             "description.zh-cn": "汇编器选项",
             "type": "object",
             "properties": {
+                "defines": {
+                    "readable_name": "Macro Defines",
+                    "readable_name.zh-cn": "宏定义",
+                    "markdownDescription": "Macro Defines",
+                    "description.zh-cn": "宏定义",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
                 "ASM_FLAGS": {
                     "markdownDescription": "Other Assembler Options",
                     "description.zh-cn": "汇编器附加选项",
diff --git a/lang/sdcc.verify.json b/lang/sdcc.verify.json
@@ -341,6 +341,16 @@
             "description.zh-cn": "汇编器选项",
             "type": "object",
             "properties": {
+                "defines": {
+                    "readable_name": "Macro Defines",
+                    "readable_name.zh-cn": "宏定义",
+                    "markdownDescription": "Macro Defines",
+                    "description.zh-cn": "宏定义",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
                 "misc-controls": {
                     "markdownDescription": "Other Assembler Options",
                     "description.zh-cn": "汇编器附加选项",
diff --git a/lang/stm8.iar.verify.json b/lang/stm8.iar.verify.json
@@ -382,6 +382,16 @@
             "description.zh-cn": "汇编器选项",
             "type": "object",
             "properties": {
+                "defines": {
+                    "readable_name": "Macro Defines",
+                    "readable_name.zh-cn": "宏定义",
+                    "markdownDescription": "Macro Defines",
+                    "description.zh-cn": "宏定义",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
                 "case-sensitive-user-symbols": {
                     "description": "case sensitive user symbols",
                     "type": "boolean",
diff --git a/package.json b/package.json
@@ -30,6 +30,7 @@
         "vscode": "^1.38.0"
     },
     "categories": [
+        "Extension Packs",
         "Programming Languages",
         "Other",
         "Snippets"
@@ -45,8 +46,7 @@
         "email": "2584456014@qq.com"
     },
     "os": [
-        "win32",
-        "windows"
+        "Win32"
     ],
     "repository": {
         "url": "https://github.com/github0null/eide.git",
@@ -83,7 +83,59 @@
         "x2js": "^3.3.1",
         "yaml": "^1.10.2"
     },
+    "extensionPack": [
+        "dan-c-underwood.arm",
+        "zixuanwang.linkerscript",
+        "keroc.hex-fmt",
+        "hars.cppsnippets",
+        "marus25.cortex-debug"
+    ],
     "contributes": {
+        "walkthroughs": [
+            {
+                "id": "eide.startup.walkthroughs",
+                "title": "%string.eide.startup.walkthroughs%",
+                "description": "%string.eide.startup.walkthroughs.detail%",
+                "steps": [
+                    {
+                        "id": "eide.wt.install_tool",
+                        "title": "%string.eide.setup.toolchain%",
+                        "description": "%string.eide.setup.toolchain.detail%",
+                        "media": {
+                            "image": "img/setup_toochain.png",
+                            "altText": "setup toolchain"
+                        },
+                        "completionEvents": [
+                            "onContext:cl.eide.toolchain_ready"
+                        ]
+                    },
+                    {
+                        "id": "eide.wt.start_project",
+                        "title": "%string.eide.start_project%",
+                        "description": "%string.eide.start_project.detail%",
+                        "media": {
+                            "image": "img/start_project.png",
+                            "altText": "start a project"
+                        },
+                        "completionEvents": [
+                            "onContext:cl.eide.projectActived"
+                        ]
+                    },
+                    {
+                        "id": "eide.wt.docs",
+                        "title": "%string.eide.open_docs%",
+                        "description": "%string.eide.open_docs.detail%",
+                        "media": {
+                            "image": "img/open_docs.png",
+                            "altText": "eide docs"
+                        },
+                        "completionEvents": [
+                            "onLink:https://docs.em-ide.com/"
+                        ]
+                    }
+                ]
+            }
+        ],
         "configuration": [
             {
                 "title": "Embedded IDE",
@@ -359,6 +411,18 @@
             ]
         },
         "commands": [
+            {
+                "command": "eide.operation.install_toolchain",
+                "title": "Install toolchain for eide"
+            },
+            {
+                "command": "eide.operation.import_project",
+                "title": "Import a project by eide"
+            },
+            {
+                "command": "eide.operation.new_project",
+                "title": "Create a new project by eide"
+            },
             {
                 "command": "_cl.eide.workspace.build",
                 "title": "%eide.workspace.build%",
diff --git a/package.nls.json b/package.nls.json
@@ -113,5 +113,14 @@
     "settings.cppcheck.exec.path": "cppcheck.exe executable path",
 
     "settings.option.disable.editor_context.menu": "Disable editor context menu",
-    "settings.option.disable.explorer_context.menu": "Disable explorer context menu"
+    "settings.option.disable.explorer_context.menu": "Disable explorer context menu",
+
+    "string.eide.startup.walkthroughs": "Embedded IDE Startup",
+    "string.eide.startup.walkthroughs.detail": "We'll show you how to get started with Embedded IDE.",
+    "string.eide.setup.toolchain": "Setup Toolchain",
+    "string.eide.setup.toolchain.detail": "Before you start, we need to setup the path of the toolchain(compiler).\n[Setup Toolchain](command:eide.operation.install_toolchain)",
+    "string.eide.start_project": "Start Your Project",
+    "string.eide.start_project.detail": "Now, We can create a project !\n[New Project](command:eide.operation.new_project)\nor import a MDK project !\n[Import Keil Project](command:eide.operation.import_project)",
+    "string.eide.open_docs": "Learn More",
+    "string.eide.open_docs.detail": "Click the link will open the manual that may help you learn more about usage.\n[Embedded IDE Document](https://docs.em-ide.com/)"
 }
diff --git a/package.nls.zh-CN.json b/package.nls.zh-CN.json
@@ -113,5 +113,14 @@
     "settings.cppcheck.exec.path": "cppcheck.exe 可执行文件路径",
     
     "settings.option.disable.editor_context.menu": "禁用编辑器上下文菜单",
-    "settings.option.disable.explorer_context.menu": "禁用资源浏览器上下文菜单"
+    "settings.option.disable.explorer_context.menu": "禁用资源浏览器上下文菜单",
+
+    "string.eide.startup.walkthroughs": "Embedded IDE 演示",
+    "string.eide.startup.walkthroughs.detail": "我们将向您展示如何开始使用 Embedded IDE 。",
+    "string.eide.setup.toolchain": "设置编译器路径",
+    "string.eide.setup.toolchain.detail": "在开始之前，我们需要设置工具链(编译器)的路径。\n[设置工具链](command:eide.operation.install_toolchain)",
+    "string.eide.start_project": "开始你的项目",
+    "string.eide.start_project.detail": "现在，我们可以创建一个项目 ！\n[New Project](command:eide.operation.new_project)\n或者导入一个 MDK 项目 ！\n[Import Keil Project](command:eide.operation.import_project)",
+    "string.eide.open_docs": "了解更多",
+    "string.eide.open_docs.detail": "点击链接可以打开文档，也许能帮您了解到更多的用法。\n[Embedded IDE Document](https://docs.em-ide.com/)"
 }
diff --git a/res/html/builder_options/css/app.css b/res/html/builder_options/css/app.css
diff --git a/res/html/builder_options/js/app.js b/res/html/builder_options/js/app.js
