github0null · github0null · Feb 26, 2023 · Feb 25, 2023 · Feb 25, 2023 · Feb 25, 2023
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,27 @@ All notable version changes will be recorded in this file.
 
 ***
 
+### [v3.11.0] revision
+
+**New**:
+  - `Object Order For Linker`: Allow specify an order for any obj files before the builder start to link your program.
+
+    ![](https://em-ide.com/public-assets/img/v3.11.x/obj_order_preview.png)
+
+  - `Extra Compiler Args`: Use Webview UI to replace config file. More Convenience !
+
+    ![](https://em-ide.com/public-assets/img/v3.11.x/source_extra_args_preview.png)
+
+  - `Toolchain Configurations`: Add webview UI to configure `toolchain path` or `toolchain prefix` for current project.
+
+    ![](https://em-ide.com/public-assets/img/v3.11.x/toolchain_cfg_preview.png)
+
+**Change**:
+  - `Remove Built-in Serial-Monitor`: We removed built-in serial monitor for eide. Please use [ms-vscode.vscode-serial-monitor](https://marketplace.visualstudio.com/items?itemName=ms-vscode.vscode-serial-monitor) now !
+  - `Extra Compiler Args For Source Files`: For `virtualPathFiles`, pattern must start with: `<virtual_root>/`
+
+***
+
 ### [v3.10.11] revision
 
 **Fix**:

diff --git a/lang/any.gcc.verify.json b/lang/any.gcc.verify.json
@@ -243,6 +243,28 @@
                     "description.zh-cn": "链接库，例如：-lxxx",
                     "$ref": "#/definitions/FLAGS",
                     "default": ""
+                },
+                "object-order": {
+                    "type": "array",
+                    "readable_name": "Object Order",
+                    "readable_name.zh-cn": "Object Order",
+                    "markdownDescription": "Object Order (used to determine the order in which object files are linked)",
+                    "description.zh-cn": "Object Order（用于决定某些 obj 文件的链接顺序）",
+                    "default": [],
+                    "properties": {
+                        "pattern": {
+                            "type": "string",
+                            "readable_name": "Pattern",
+                            "description": "A glob pattern (https://github.com/dazinator/DotNet.Glob) to match a object (*.o) file",
+                            "default": "**/your/pattern/for/object/file/path/*.o"
+                        },
+                        "order": {
+                            "type": "number",
+                            "readable_name": "Order",
+                            "description": "An integer number (The smaller the value, the higher the priority)",
+                            "default": 0
+                        }
+                    }
                 }
             }
         }

diff --git a/lang/arm.gcc.verify.json b/lang/arm.gcc.verify.json
@@ -332,6 +332,28 @@
                     "description.zh-cn": "链接库选项，例如：-lxxx",
                     "$ref": "#/definitions/FLAGS",
                     "default": ""
+                },
+                "object-order": {
+                    "type": "array",
+                    "readable_name": "Object Order",
+                    "readable_name.zh-cn": "Object Order",
+                    "markdownDescription": "Object Order (used to determine the order in which object files are linked)",
+                    "description.zh-cn": "Object Order（用于决定某些 obj 文件的链接顺序）",
+                    "default": [],
+                    "properties": {
+                        "pattern": {
+                            "type": "string",
+                            "readable_name": "Pattern",
+                            "description": "A glob pattern (https://github.com/dazinator/DotNet.Glob) to match a object (*.o) file",
+                            "default": "**/your/pattern/for/object/file/path/*.o"
+                        },
+                        "order": {
+                            "type": "number",
+                            "readable_name": "Order",
+                            "description": "An integer number (The smaller the value, the higher the priority)",
+                            "default": 0
+                        }
+                    }
                 }
             }
         }

diff --git a/lang/arm.iar.verify.json b/lang/arm.iar.verify.json
@@ -473,6 +473,28 @@
                     "markdownDescription": "Other Linker Options",
                     "description.zh-cn": "链接器附加选项",
                     "$ref": "#/definitions/misc-controls"
+                },
+                "object-order": {
+                    "type": "array",
+                    "readable_name": "Object Order",
+                    "readable_name.zh-cn": "Object Order",
+                    "markdownDescription": "Object Order (used to determine the order in which object files are linked)",
+                    "description.zh-cn": "Object Order（用于决定某些 obj 文件的链接顺序）",
+                    "default": [],
+                    "properties": {
+                        "pattern": {
+                            "type": "string",
+                            "readable_name": "Pattern",
+                            "description": "A glob pattern (https://github.com/dazinator/DotNet.Glob) to match a object (*.o) file",
+                            "default": "**/your/pattern/for/object/file/path/*.o"
+                        },
+                        "order": {
+                            "type": "number",
+                            "readable_name": "Order",
+                            "description": "An integer number (The smaller the value, the higher the priority)",
+                            "default": 0
+                        }
+                    }
                 }
             }
         }

diff --git a/lang/arm.v5.verify.json b/lang/arm.v5.verify.json
@@ -462,6 +462,28 @@
                         "type": "string"
                     },
                     "default": ""
+                },
+                "object-order": {
+                    "type": "array",
+                    "readable_name": "Object Order",
+                    "readable_name.zh-cn": "Object Order",
+                    "markdownDescription": "Object Order (used to determine the order in which object files are linked)",
+                    "description.zh-cn": "Object Order（用于决定某些 obj 文件的链接顺序）",
+                    "default": [],
+                    "properties": {
+                        "pattern": {
+                            "type": "string",
+                            "readable_name": "Pattern",
+                            "description": "A glob pattern (https://github.com/dazinator/DotNet.Glob) to match a object (*.o) file",
+                            "default": "**/your/pattern/for/object/file/path/*.o"
+                        },
+                        "order": {
+                            "type": "number",
+                            "readable_name": "Order",
+                            "description": "An integer number (The smaller the value, the higher the priority)",
+                            "default": 0
+                        }
+                    }
                 }
             }
         }

diff --git a/lang/arm.v6.verify.json b/lang/arm.v6.verify.json
@@ -400,6 +400,28 @@
                         "type": "string"
                     },
                     "default": ""
+                },
+                "object-order": {
+                    "type": "array",
+                    "readable_name": "Object Order",
+                    "readable_name.zh-cn": "Object Order",
+                    "markdownDescription": "Object Order (used to determine the order in which object files are linked)",
+                    "description.zh-cn": "Object Order（用于决定某些 obj 文件的链接顺序）",
+                    "default": [],
+                    "properties": {
+                        "pattern": {
+                            "type": "string",
+                            "readable_name": "Pattern",
+                            "description": "A glob pattern (https://github.com/dazinator/DotNet.Glob) to match a object (*.o) file",
+                            "default": "**/your/pattern/for/object/file/path/*.o"
+                        },
+                        "order": {
+                            "type": "number",
+                            "readable_name": "Order",
+                            "description": "An integer number (The smaller the value, the higher the priority)",
+                            "default": 0
+                        }
+                    }
                 }
             }
         }

diff --git a/lang/riscv.gcc.verify.json b/lang/riscv.gcc.verify.json
@@ -344,6 +344,28 @@
                     "description.zh-cn": "链接库选项，例如：-lxxx",
                     "$ref": "#/definitions/FLAGS",
                     "default": ""
+                },
+                "object-order": {
+                    "type": "array",
+                    "readable_name": "Object Order",
+                    "readable_name.zh-cn": "Object Order",
+                    "markdownDescription": "Object Order (used to determine the order in which object files are linked)",
+                    "description.zh-cn": "Object Order（用于决定某些 obj 文件的链接顺序）",
+                    "default": [],
+                    "properties": {
+                        "pattern": {
+                            "type": "string",
+                            "readable_name": "Pattern",
+                            "description": "A glob pattern (https://github.com/dazinator/DotNet.Glob) to match a object (*.o) file",
+                            "default": "**/your/pattern/for/object/file/path/*.o"
+                        },
+                        "order": {
+                            "type": "number",
+                            "readable_name": "Order",
+                            "description": "An integer number (The smaller the value, the higher the priority)",
+                            "default": 0
+                        }
+                    }
                 }
             }
         }

diff --git a/lang/sdcc.verify.json b/lang/sdcc.verify.json
@@ -412,6 +412,28 @@
                     "markdownDescription": "Other Linker Options",
                     "description.zh-cn": "链接器附加选项",
                     "$ref": "#/definitions/misc-controls"
+                },
+                "object-order": {
+                    "type": "array",
+                    "readable_name": "Object Order",
+                    "readable_name.zh-cn": "Object Order",
+                    "markdownDescription": "Object Order (used to determine the order in which object files are linked)",
+                    "description.zh-cn": "Object Order（用于决定某些 obj 文件的链接顺序）",
+                    "default": [],
+                    "properties": {
+                        "pattern": {
+                            "type": "string",
+                            "readable_name": "Pattern",
+                            "description": "A glob pattern (https://github.com/dazinator/DotNet.Glob) to match a object (*.o) file",
+                            "default": "**/your/pattern/for/object/file/path/*.o"
+                        },
+                        "order": {
+                            "type": "number",
+                            "readable_name": "Order",
+                            "description": "An integer number (The smaller the value, the higher the priority)",
+                            "default": 0
+                        }
+                    }
                 }
             }
         }

diff --git a/lang/stm8.iar.verify.json b/lang/stm8.iar.verify.json
@@ -521,6 +521,28 @@
                     "markdownDescription": "Other Linker Options",
                     "description.zh-cn": "链接器附加选项",
                     "$ref": "#/definitions/misc-controls"
+                },
+                "object-order": {
+                    "type": "array",
+                    "readable_name": "Object Order",
+                    "readable_name.zh-cn": "Object Order",
+                    "markdownDescription": "Object Order (used to determine the order in which object files are linked)",
+                    "description.zh-cn": "Object Order（用于决定某些 obj 文件的链接顺序）",
+                    "default": [],
+                    "properties": {
+                        "pattern": {
+                            "type": "string",
+                            "readable_name": "Pattern",
+                            "description": "A glob pattern (https://github.com/dazinator/DotNet.Glob) to match a object (*.o) file",
+                            "default": "**/your/pattern/for/object/file/path/*.o"
+                        },
+                        "order": {
+                            "type": "number",
+                            "readable_name": "Order",
+                            "description": "An integer number (The smaller the value, the higher the priority)",
+                            "default": 0
+                        }
+                    }
                 }
             }
         }

diff --git a/package.json b/package.json
@@ -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.11",
+    "version": "3.11.0",
     "preview": false,
     "engines": {
         "vscode": "^1.67.0"
@@ -681,6 +681,14 @@
                 "command": "_cl.eide.project.source.virtual_folder_rename",
                 "title": "%eide.explorer.rename.folder%"
             },
+            {
+                "command": "_cl.eide.project.source.file.modify.extraArgs",
+                "title": "%eide.explorer.file.modify.extraArgs%"
+            },
+            {
+                "command": "_cl.eide.project.source.folder.modify.extraArgs",
+                "title": "%eide.explorer.folder.modify.extraArgs%"
+            },
             {
                 "command": "_cl.eide.project.refresh",
                 "title": "%eide.project.refresh%",
@@ -863,6 +871,10 @@
                     "light": "./res/icon/SwitchSourceOrTarget_16x.svg"
                 }
             },
+            {
+                "command": "_cl.eide.project.configToolchain",
+                "title": "%eide.builder.config%"
+            },
             {
                 "command": "_cl.eide.project.switchUploader",
                 "title": "%eide.flash.switch%",
@@ -1231,6 +1243,14 @@
                     "command": "_cl.eide.project.source.modify.path",
                     "when": "viewItem == PROJECT || viewItem == V_FOLDER || viewItem == V_FOLDER_ROOT || viewItem == V_FILE_ITEM || viewItem == V_EXCFILE_ITEM && view == cl.eide.view.projects"
                 },
+                {
+                    "command": "_cl.eide.project.source.file.modify.extraArgs",
+                    "when": "viewItem == FILE_ITEM || viewItem == V_FILE_ITEM && view == cl.eide.view.projects"
+                },
+                {
+                    "command": "_cl.eide.project.source.folder.modify.extraArgs",
+                    "when": "viewItem == FOLDER || viewItem == FOLDER_ROOT || viewItem == V_FOLDER || viewItem == V_FOLDER_ROOT && view == cl.eide.view.projects"
+                },
                 {
                     "command": "_cl.eide.project.addPackage",
                     "group": "inline",
@@ -1394,6 +1414,10 @@
                     "group": "inline",
                     "when": "viewItem == COMPILE_CONFIGURATION && view == cl.eide.view.projects"
                 },
+                {
+                    "command": "_cl.eide.project.configToolchain",
+                    "when": "viewItem == COMPILE_CONFIGURATION && view == cl.eide.view.projects"
+                },
                 {
                     "command": "_cl.eide.project.switchUploader",
                     "group": "inline",

diff --git a/package.nls.json b/package.nls.json
@@ -29,7 +29,7 @@
     "eide.project.upload": "Program Flash",
     "eide.project.flash.erase.all": "Erase Chip",
     "eide.project.gen.makefile": "Generate Makefile Template",
-    "eide.project.modify.files.options": "Append independent compiler args for sources",
+    "eide.project.modify.files.options": "Show Source Files Extra Compiler Args",
     "eide.project.import.ext.project.src.struct": "Import source tree from other projects",
     "eide.project.generate_builder_params": "Generate builder.params",
 
@@ -67,7 +67,9 @@
     "eide.explorer.show.file.dir": "Show In File Explorer",
     "eide.explorer.modify.file.path": "Modify File Path",
     "eide.explorer.modify.exclude_list": "Modify Source File Exclude List",
-
+    "eide.explorer.file.modify.extraArgs": "Modify Extra Compiler Args",
+    "eide.explorer.folder.modify.extraArgs": "Modify Extra Compiler Args",
+
     "eide.source.show_cmsis_config_wizard": "CMSIS Configuration Wizard",
     "eide.source.show.disassembly": "Show Disassembly",
     "eide.source.run.cppcheck": "Cppcheck This File",
@@ -82,6 +84,7 @@
     "eide.package.comp.uninstall": "Uninstall Component",
 
     "eide.builder.switch": "Choose Toolchain",
+    "eide.builder.config": "Configure Toolchain",
     "eide.builder.setup-toolchain-prefix": "Setup Compiler Prefix",
 
     "eide.flash.switch": "Choose Flasher",

diff --git a/package.nls.zh-CN.json b/package.nls.zh-CN.json
@@ -29,7 +29,7 @@
     "eide.project.upload": "烧录",
     "eide.project.flash.erase.all": "擦除芯片",
     "eide.project.gen.makefile": "生成 Makefile 模板",
-    "eide.project.modify.files.options": "为源文件附加单独的编译参数",
+    "eide.project.modify.files.options": "查看所有的源文件附加编译参数",
     "eide.project.import.ext.project.src.struct": "从其他 IDE 的项目中导入源文件树",
     "eide.project.generate_builder_params": "生成 builder.params",
 
@@ -60,7 +60,9 @@
     "eide.explorer.show.file.dir": "在文件浏览器中显示",
     "eide.explorer.modify.file.path": "修改源文件路径",
     "eide.explorer.modify.exclude_list": "修改源文件排除列表",
-
+    "eide.explorer.file.modify.extraArgs": "修改此文件的附加编译参数",
+    "eide.explorer.folder.modify.extraArgs": "修改此文件夹的附加编译参数",
+
     "eide.source.show_cmsis_config_wizard": "CMSIS Configuration Wizard",
     "eide.source.show.disassembly": "查看反汇编",
     "eide.source.run.cppcheck": "使用 Cppcheck 进行检查",
@@ -74,7 +76,8 @@
     "eide.package.comp.install": "安装组件",
     "eide.package.comp.uninstall": "移除组件",
 
-    "eide.builder.switch": "切换编译工具",
+    "eide.builder.switch": "切换编译器",
+    "eide.builder.config": "编译器配置",
     "eide.builder.setup-toolchain-prefix": "设置编译器前缀",
 
     "eide.flash.switch": "切换烧录器",

diff --git a/res/data/config.yaml b/res/data/config.yaml
@@ -2,4 +2,4 @@
 
 version: '1.0'
 
-binary_min_version: '10.0.0'
+binary_min_version: '11.0.0'
diff --git a/res/html/builder_options/js/app.js b/res/html/builder_options/js/app.js
diff --git a/res/html/builder_options/js/chunk-vendors.js b/res/html/builder_options/js/chunk-vendors.js
diff --git a/res/html/simple_config_ui/css/app.css b/res/html/simple_config_ui/css/app.css
diff --git a/res/html/simple_config_ui/fonts/MaterialIcons-Regular.ttf b/res/html/simple_config_ui/fonts/MaterialIcons-Regular.ttf
diff --git a/res/html/simple_config_ui/fonts/consola.ttf b/res/html/simple_config_ui/fonts/consola.ttf
diff --git a/res/html/simple_config_ui/fonts/consolab.ttf b/res/html/simple_config_ui/fonts/consolab.ttf
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		version: '1.0'

		binary_min_version: '10.0.0'
		binary_min_version: '11.0.0'