Skip to content

Commit ca52352

Browse files
github0nullgithub0null
authored
Merge pull request #216 from github0null/dev
v3.11.0 update
2 parents 941c458 + b8efde6 commit ca52352

39 files changed

Lines changed: 1092 additions & 257 deletions

‎CHANGELOG.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,27 @@ All notable version changes will be recorded in this file.
66

77
***
88

9+
### [v3.11.0] revision
10+
11+
**New**:
12+
- `Object Order For Linker`: Allow specify an order for any obj files before the builder start to link your program.
13+
14+
![](https://em-ide.com/public-assets/img/v3.11.x/obj_order_preview.png)
15+
16+
- `Extra Compiler Args`: Use Webview UI to replace config file. More Convenience !
17+
18+
![](https://em-ide.com/public-assets/img/v3.11.x/source_extra_args_preview.png)
19+
20+
- `Toolchain Configurations`: Add webview UI to configure `toolchain path` or `toolchain prefix` for current project.
21+
22+
![](https://em-ide.com/public-assets/img/v3.11.x/toolchain_cfg_preview.png)
23+
24+
**Change**:
25+
- `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 !
26+
- `Extra Compiler Args For Source Files`: For `virtualPathFiles`, pattern must start with: `<virtual_root>/`
27+
28+
***
29+
930
### [v3.10.11] revision
1031

1132
**Fix**:

‎lang/any.gcc.verify.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,28 @@
243243
"description.zh-cn": "链接库，例如：-lxxx",
244244
"$ref": "#/definitions/FLAGS",
245245
"default": ""
246+
},
247+
"object-order": {
248+
"type": "array",
249+
"readable_name": "Object Order",
250+
"readable_name.zh-cn": "Object Order",
251+
"markdownDescription": "Object Order (used to determine the order in which object files are linked)",
252+
"description.zh-cn": "Object Order（用于决定某些 obj 文件的链接顺序）",
253+
"default": [],
254+
"properties": {
255+
"pattern": {
256+
"type": "string",
257+
"readable_name": "Pattern",
258+
"description": "A glob pattern (https://github.com/dazinator/DotNet.Glob) to match a object (*.o) file",
259+
"default": "**/your/pattern/for/object/file/path/*.o"
260+
},
261+
"order": {
262+
"type": "number",
263+
"readable_name": "Order",
264+
"description": "An integer number (The smaller the value, the higher the priority)",
265+
"default": 0
266+
}
267+
}
246268
}
247269
}
248270
}

‎lang/arm.gcc.verify.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,28 @@
332332
"description.zh-cn": "链接库选项，例如：-lxxx",
333333
"$ref": "#/definitions/FLAGS",
334334
"default": ""
335+
},
336+
"object-order": {
337+
"type": "array",
338+
"readable_name": "Object Order",
339+
"readable_name.zh-cn": "Object Order",
340+
"markdownDescription": "Object Order (used to determine the order in which object files are linked)",
341+
"description.zh-cn": "Object Order（用于决定某些 obj 文件的链接顺序）",
342+
"default": [],
343+
"properties": {
344+
"pattern": {
345+
"type": "string",
346+
"readable_name": "Pattern",
347+
"description": "A glob pattern (https://github.com/dazinator/DotNet.Glob) to match a object (*.o) file",
348+
"default": "**/your/pattern/for/object/file/path/*.o"
349+
},
350+
"order": {
351+
"type": "number",
352+
"readable_name": "Order",
353+
"description": "An integer number (The smaller the value, the higher the priority)",
354+
"default": 0
355+
}
356+
}
335357
}
336358
}
337359
}

‎lang/arm.iar.verify.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,28 @@
473473
"markdownDescription": "Other Linker Options",
474474
"description.zh-cn": "链接器附加选项",
475475
"$ref": "#/definitions/misc-controls"
476+
},
477+
"object-order": {
478+
"type": "array",
479+
"readable_name": "Object Order",
480+
"readable_name.zh-cn": "Object Order",
481+
"markdownDescription": "Object Order (used to determine the order in which object files are linked)",
482+
"description.zh-cn": "Object Order（用于决定某些 obj 文件的链接顺序）",
483+
"default": [],
484+
"properties": {
485+
"pattern": {
486+
"type": "string",
487+
"readable_name": "Pattern",
488+
"description": "A glob pattern (https://github.com/dazinator/DotNet.Glob) to match a object (*.o) file",
489+
"default": "**/your/pattern/for/object/file/path/*.o"
490+
},
491+
"order": {
492+
"type": "number",
493+
"readable_name": "Order",
494+
"description": "An integer number (The smaller the value, the higher the priority)",
495+
"default": 0
496+
}
497+
}
476498
}
477499
}
478500
}

‎lang/arm.v5.verify.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,28 @@
462462
"type": "string"
463463
},
464464
"default": ""
465+
},
466+
"object-order": {
467+
"type": "array",
468+
"readable_name": "Object Order",
469+
"readable_name.zh-cn": "Object Order",
470+
"markdownDescription": "Object Order (used to determine the order in which object files are linked)",
471+
"description.zh-cn": "Object Order（用于决定某些 obj 文件的链接顺序）",
472+
"default": [],
473+
"properties": {
474+
"pattern": {
475+
"type": "string",
476+
"readable_name": "Pattern",
477+
"description": "A glob pattern (https://github.com/dazinator/DotNet.Glob) to match a object (*.o) file",
478+
"default": "**/your/pattern/for/object/file/path/*.o"
479+
},
480+
"order": {
481+
"type": "number",
482+
"readable_name": "Order",
483+
"description": "An integer number (The smaller the value, the higher the priority)",
484+
"default": 0
485+
}
486+
}
465487
}
466488
}
467489
}

‎lang/arm.v6.verify.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,28 @@
400400
"type": "string"
401401
},
402402
"default": ""
403+
},
404+
"object-order": {
405+
"type": "array",
406+
"readable_name": "Object Order",
407+
"readable_name.zh-cn": "Object Order",
408+
"markdownDescription": "Object Order (used to determine the order in which object files are linked)",
409+
"description.zh-cn": "Object Order（用于决定某些 obj 文件的链接顺序）",
410+
"default": [],
411+
"properties": {
412+
"pattern": {
413+
"type": "string",
414+
"readable_name": "Pattern",
415+
"description": "A glob pattern (https://github.com/dazinator/DotNet.Glob) to match a object (*.o) file",
416+
"default": "**/your/pattern/for/object/file/path/*.o"
417+
},
418+
"order": {
419+
"type": "number",
420+
"readable_name": "Order",
421+
"description": "An integer number (The smaller the value, the higher the priority)",
422+
"default": 0
423+
}
424+
}
403425
}
404426
}
405427
}

‎lang/riscv.gcc.verify.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,28 @@
344344
"description.zh-cn": "链接库选项，例如：-lxxx",
345345
"$ref": "#/definitions/FLAGS",
346346
"default": ""
347+
},
348+
"object-order": {
349+
"type": "array",
350+
"readable_name": "Object Order",
351+
"readable_name.zh-cn": "Object Order",
352+
"markdownDescription": "Object Order (used to determine the order in which object files are linked)",
353+
"description.zh-cn": "Object Order（用于决定某些 obj 文件的链接顺序）",
354+
"default": [],
355+
"properties": {
356+
"pattern": {
357+
"type": "string",
358+
"readable_name": "Pattern",
359+
"description": "A glob pattern (https://github.com/dazinator/DotNet.Glob) to match a object (*.o) file",
360+
"default": "**/your/pattern/for/object/file/path/*.o"
361+
},
362+
"order": {
363+
"type": "number",
364+
"readable_name": "Order",
365+
"description": "An integer number (The smaller the value, the higher the priority)",
366+
"default": 0
367+
}
368+
}
347369
}
348370
}
349371
}

‎lang/sdcc.verify.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,28 @@
412412
"markdownDescription": "Other Linker Options",
413413
"description.zh-cn": "链接器附加选项",
414414
"$ref": "#/definitions/misc-controls"
415+
},
416+
"object-order": {
417+
"type": "array",
418+
"readable_name": "Object Order",
419+
"readable_name.zh-cn": "Object Order",
420+
"markdownDescription": "Object Order (used to determine the order in which object files are linked)",
421+
"description.zh-cn": "Object Order（用于决定某些 obj 文件的链接顺序）",
422+
"default": [],
423+
"properties": {
424+
"pattern": {
425+
"type": "string",
426+
"readable_name": "Pattern",
427+
"description": "A glob pattern (https://github.com/dazinator/DotNet.Glob) to match a object (*.o) file",
428+
"default": "**/your/pattern/for/object/file/path/*.o"
429+
},
430+
"order": {
431+
"type": "number",
432+
"readable_name": "Order",
433+
"description": "An integer number (The smaller the value, the higher the priority)",
434+
"default": 0
435+
}
436+
}
415437
}
416438
}
417439
}

‎lang/stm8.iar.verify.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,28 @@
521521
"markdownDescription": "Other Linker Options",
522522
"description.zh-cn": "链接器附加选项",
523523
"$ref": "#/definitions/misc-controls"
524+
},
525+
"object-order": {
526+
"type": "array",
527+
"readable_name": "Object Order",
528+
"readable_name.zh-cn": "Object Order",
529+
"markdownDescription": "Object Order (used to determine the order in which object files are linked)",
530+
"description.zh-cn": "Object Order（用于决定某些 obj 文件的链接顺序）",
531+
"default": [],
532+
"properties": {
533+
"pattern": {
534+
"type": "string",
535+
"readable_name": "Pattern",
536+
"description": "A glob pattern (https://github.com/dazinator/DotNet.Glob) to match a object (*.o) file",
537+
"default": "**/your/pattern/for/object/file/path/*.o"
538+
},
539+
"order": {
540+
"type": "number",
541+
"readable_name": "Order",
542+
"description": "An integer number (The smaller the value, the higher the priority)",
543+
"default": 0
544+
}
545+
}
524546
}
525547
}
526548
}

‎package.json‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"homepage": "https://em-ide.com",
3636
"license": "MIT",
3737
"description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/RISC-V",
38-
"version": "3.10.11",
38+
"version": "3.11.0",
3939
"preview": false,
4040
"engines": {
4141
"vscode": "^1.67.0"
@@ -681,6 +681,14 @@
681681
"command": "_cl.eide.project.source.virtual_folder_rename",
682682
"title": "%eide.explorer.rename.folder%"
683683
},
684+
{
685+
"command": "_cl.eide.project.source.file.modify.extraArgs",
686+
"title": "%eide.explorer.file.modify.extraArgs%"
687+
},
688+
{
689+
"command": "_cl.eide.project.source.folder.modify.extraArgs",
690+
"title": "%eide.explorer.folder.modify.extraArgs%"
691+
},
684692
{
685693
"command": "_cl.eide.project.refresh",
686694
"title": "%eide.project.refresh%",
@@ -863,6 +871,10 @@
863871
"light": "./res/icon/SwitchSourceOrTarget_16x.svg"
864872
}
865873
},
874+
{
875+
"command": "_cl.eide.project.configToolchain",
876+
"title": "%eide.builder.config%"
877+
},
866878
{
867879
"command": "_cl.eide.project.switchUploader",
868880
"title": "%eide.flash.switch%",
@@ -1231,6 +1243,14 @@
12311243
"command": "_cl.eide.project.source.modify.path",
12321244
"when": "viewItem == PROJECT || viewItem == V_FOLDER || viewItem == V_FOLDER_ROOT || viewItem == V_FILE_ITEM || viewItem == V_EXCFILE_ITEM && view == cl.eide.view.projects"
12331245
},
1246+
{
1247+
"command": "_cl.eide.project.source.file.modify.extraArgs",
1248+
"when": "viewItem == FILE_ITEM || viewItem == V_FILE_ITEM && view == cl.eide.view.projects"
1249+
},
1250+
{
1251+
"command": "_cl.eide.project.source.folder.modify.extraArgs",
1252+
"when": "viewItem == FOLDER || viewItem == FOLDER_ROOT || viewItem == V_FOLDER || viewItem == V_FOLDER_ROOT && view == cl.eide.view.projects"
1253+
},
12341254
{
12351255
"command": "_cl.eide.project.addPackage",
12361256
"group": "inline",
@@ -1394,6 +1414,10 @@
13941414
"group": "inline",
13951415
"when": "viewItem == COMPILE_CONFIGURATION && view == cl.eide.view.projects"
13961416
},
1417+
{
1418+
"command": "_cl.eide.project.configToolchain",
1419+
"when": "viewItem == COMPILE_CONFIGURATION && view == cl.eide.view.projects"
1420+
},
13971421
{
13981422
"command": "_cl.eide.project.switchUploader",
13991423
"group": "inline",

0 commit comments

Comments
 (0)