Skip to content

Commit bd584b5

Browse files
github0nullgithub0null
authored
Merge pull request #71 from github0null/dev
v1.12.3 release
2 parents a22b045 + 9ee591f commit bd584b5

23 files changed

Lines changed: 127 additions & 54 deletions

‎.gitignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,16 @@ test.js
1616
**/data/sln.record
1717
*.cpuprofile
1818
package-lock.json
19+
1920
# internal template projects
2021
res/template/projects
22+
2123
# bin
2224
bin
2325
bin/builder/*.xml
2426
bin/builder/*.exe.config
2527
bin/tools/*
26-
bin_bk
28+
bin_bk
29+
30+
# shell script
31+
*.sh

‎.vscodeignore‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,22 @@ vsc-extension-quickstart.md
2222
**/ARM/*.xml
2323
*.js
2424
*.cpuprofile
25+
*.vscodeignore
26+
2527
# internal template projects
2628
res/template/projects
2729
*.js.map
30+
2831
# eide makefile template
2932
.gitmodules
3033
res/eide_makefile_template
34+
3135
# ignore unused files
3236
bin
3337
bin/builder/*.xml
3438
bin/builder/*.exe.config
3539
bin/tools
36-
docs
40+
docs
41+
42+
# shell script
43+
*.sh

‎CHANGELOG.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@
44

55
***
66

7-
### [v2.12.2_1]
7+
### [v2.12.3]
8+
- 新增：增加一条命令 `eide.reinstall.binaries`，允许重新安装 eide-binaries
89
- 优化：支持自动读取 JLink 内部 Device 列表，以及加载 JLink 安装目录下的 'JLinkDevices.xml'
910
- 优化：使用扩展推荐，取消原来的扩展包绑定，将自动附加扩展推荐到项目工作区（在工作内打开 **扩展** -> **推荐** 即可查看）
11+
- 优化：允许向虚拟文件夹添加 c/c++ 头文件
12+
- 优化：优化构建器选项 UI (使用 element UI 代替部分 boostrap 组件)
13+
- 支持 sdcc 编译 .asm 汇编文件
14+
- 优化：为 STLink 下载方式兼容 STM32CubeProgramer 下载器，将默认 stlink 下载器安装包修改为 [st_cube_programer.7z](https://github.com/github0null/eide-resource/blob/master/packages/st_cube_programer.7z)
1015
***
1116

1217
### [v2.12.1]

‎lang/8051.keil.verify.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,8 @@
253253
"lib"
254254
],
255255
"enumDescriptions": [
256-
"executable file",
257-
"static library"
256+
"Object File",
257+
"Static Library"
258258
]
259259
},
260260
"use-RTX": {

‎lang/arm.gcc.verify.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,8 @@
288288
"lib"
289289
],
290290
"enumDescriptions": [
291-
"executable file",
292-
"static library"
291+
"ELF (Executable Linkable Format)",
292+
"Static Library"
293293
]
294294
},
295295
"LD_FLAGS": {
@@ -305,7 +305,6 @@
305305
"readable_name.zh-cn": "链接库选项",
306306
"markdownDescription": "Lib Flags, like: -lxxx",
307307
"description.zh-cn": "链接库选项，例如：-lxxx",
308-
"size": "normal",
309308
"$ref": "#/definitions/FLAGS",
310309
"default": ""
311310
}

‎lang/arm.v5.verify.json‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,6 @@
130130
"enum": [
131131
"disable",
132132
"enable"
133-
],
134-
"enumDescriptions": [
135-
"禁用 (disable)",
136-
"开启 (enable)"
137133
]
138134
}
139135
}
@@ -390,8 +386,8 @@
390386
"lib"
391387
],
392388
"enumDescriptions": [
393-
"executable file",
394-
"static library"
389+
"AXF (Arm Executable File)",
390+
"Static Library"
395391
]
396392
},
397393
"not-search-std-libs": {

‎lang/arm.v6.verify.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,8 @@
316316
"lib"
317317
],
318318
"enumDescriptions": [
319-
"executable file",
320-
"static library"
319+
"AXF (Arm Executable File)",
320+
"Static Library"
321321
]
322322
},
323323
"misc-controls": {

‎lang/riscv.gcc.verify.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,8 @@
298298
"lib"
299299
],
300300
"enumDescriptions": [
301-
"executable file",
302-
"static library"
301+
"ELF (Executable Linkable Format)",
302+
"Static Library"
303303
]
304304
},
305305
"LD_FLAGS": {
@@ -315,7 +315,6 @@
315315
"readable_name.zh-cn": "链接库选项",
316316
"markdownDescription": "Lib Flags, like: -lxxx",
317317
"description.zh-cn": "链接库选项，例如：-lxxx",
318-
"size": "normal",
319318
"$ref": "#/definitions/FLAGS",
320319
"default": ""
321320
}

‎lang/sdcc.verify.json‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -341,16 +341,6 @@
341341
"description.zh-cn": "汇编器选项",
342342
"type": "object",
343343
"properties": {
344-
"defines": {
345-
"readable_name": "Macro Defines",
346-
"readable_name.zh-cn": "宏定义",
347-
"markdownDescription": "Macro Defines",
348-
"description.zh-cn": "宏定义",
349-
"type": "array",
350-
"items": {
351-
"type": "string"
352-
}
353-
},
354344
"misc-controls": {
355345
"markdownDescription": "Other Assembler Options",
356346
"description.zh-cn": "汇编器附加选项",
@@ -375,9 +365,9 @@
375365
"lib"
376366
],
377367
"enumDescriptions": [
378-
"Intel HEX Format",
379-
"Motorola S19 Format",
380-
"ELF Format (Only for STM8/HC08/S08)",
368+
"Intel HEX File",
369+
"Motorola S19 File",
370+
"ELF File (Only for STM8/HC08/S08)",
381371
"Static Library"
382372
]
383373
},
@@ -396,14 +386,16 @@
396386
"markdownDescription": "Object file suffix, default: '.rel'",
397387
"description.zh-cn": "obj 文件后缀, 默认：'.rel'",
398388
"type": "string",
389+
"size": "small",
399390
"default": ".rel"
400391
},
401392
"$mainFileName": {
402393
"readable_name": "Source filename containing 'main()'",
403-
"readable_name.zh-cn": "含有 main() 函数的源文件名",
394+
"readable_name.zh-cn": "main() 函数所在源文件",
404395
"markdownDescription": "Source filename containing 'main()', default: 'main'",
405396
"description.zh-cn": "含有 main() 函数的源文件名，默认：'main'",
406397
"type": "string",
398+
"size": "small",
407399
"default": "main"
408400
},
409401
"misc-controls": {

‎lang/stm8.gnu-sdcc.verify.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@
343343
"lib"
344344
],
345345
"enumDescriptions": [
346-
"ELF Format",
346+
"ELF (Executable Linkable Format)",
347347
"Static Library"
348348
]
349349
},
@@ -357,7 +357,6 @@
357357
"readable_name.zh-cn": "链接库选项",
358358
"markdownDescription": "Lib Flags, like: -lxxx",
359359
"description.zh-cn": "链接库选项，例如：-lxxx",
360-
"size": "normal",
361360
"$ref": "#/definitions/misc-controls",
362361
"default": ""
363362
}

0 commit comments

Comments
 (0)