Merge pull request #312 from github0null/dev

v3.15.0 update

Author: github0null

CHANGELOG.md

@@ -6,6 +6,27 @@ All notable version changes will be recorded in this file.
 
 ***
 
+### [v3.15.0] update
+
+**New**:
+  - `RightClick Menu`: Add groups for menu
+
+**Optimize**:
+  - `COSMIC STM8`: Auto select crts*.stm8 library 
+
+***
+
+### [v3.14.20240116] revision
+
+**New**:
+  - `Clangd Support`: Auto generate `.clangd` config for your project. (Only for gcc/clang compiler !)
+  - `Library Generator Support`: Add libs generator, support archive your obj files after build done.
+
+**Optimize**:
+  - `OpenOCD Flasher`: Allow select 'None' config.
+
+***
+
 ### [v3.14.0] update
 
 **New**:

lang/stm8.cosmic.verify.json

@@ -294,6 +294,19 @@
                     "type": "boolean",
                     "default": false
                 },
+                "crts-initialize": {
+                    "description": "Range Of Variables To Be Initialized",
+                    "type": "string",
+                    "default": "crtsi",
+                    "enum": [
+                        "crtsi",
+                        "crtsx"
+                    ],
+                    "enumDescriptions": [
+                        "@near",
+                        "@near and @far"
+                    ]
+                },
                 "LD_FLAGS": {
                     "markdownDescription": "Other Linker Options (clnk)",
                     "$ref": "#/definitions/misc-controls"

package.json

@@ -11,13 +11,15 @@
     "eide.function.reload.jlink.dev.list": "Reload JLink Devices List",
     "eide.function.reload.stm8.dev.list": "Reload STM8 Devices List",
     "eide.function.reinstall.binaries": "Reinstall eide binaries",
+    "eide.function.gen_clang_format": "Create new .clang-format template file",
+    "eide.function.open_libs.yml": "Open Libs Generator Configuration",
 
     "eide.project.show_project_vars": "Show All Project Variables",
     "eide.project.save": "Save Project",
     "eide.project.refresh": "Refresh",
     "eide.project.save.all": "Save All Projects",
     "eide.project.active": "Active Project",
-    "eide.project.close": "Close",
+    "eide.project.close": "Close Project",
     "eide.project.export.template": "Export Eide Project Template",
     "eide.project.export.keil": "Export Keil Project",
     "eide.project.show.commands": "Show Compiler CommandLine",
@@ -29,7 +31,7 @@
     "eide.project.upload": "Program Flash",
     "eide.project.flash.erase.all": "Erase Chip",
     "eide.project.modify.files.options": "Show Source Files Extra Compiler Options",
-    "eide.project.import.ext.project.src.struct": "Import source tree from other projects",
+    "eide.project.import.ext.project.src.struct": "Import SourceFile Tree From Other Project",
     "eide.project.generate_builder_params": "Generate builder.params",
 
     "eide.prj.menus.main.cppcheck": "Static Check",

package.nls.json

@@ -11,6 +11,8 @@
     "eide.function.reload.jlink.dev.list": "重新加载 JLink 芯片信息列表",
     "eide.function.reload.stm8.dev.list": "重新加载 STM8 芯片信息列表",
     "eide.function.reinstall.binaries": "重新安装 eide binaries",
+    "eide.function.gen_clang_format": "新建 .clang-format 代码格式化配置模板",
+    "eide.function.open_libs.yml": "打开lib生成器配置",
 
     "eide.project.show_project_vars": "显示所有可用的项目变量",
     "eide.project.save": "保存项目",

package.nls.zh-CN.json

@@ -0,0 +1,26 @@
+##########################################################################################
+#                        Generate libs for your project
+# syntax:
+# ---
+#  <your lib name>:
+#     - <obj file 1>
+#     - <obj file 2>
+#
+# For more syntax, please refer to: https://www.npmjs.com/package/micromatch
+#
+##########################################################################################
+
+## ----------------------------
+## examples
+##  This examples will generate 2 libs after build done, 
+##  they are: 'app.lib', 'test.lib'
+## ----------------------------
+#app:
+#  - '**/src/app.o'
+#  - '**/src/a.o'
+#  - '**/src/a/*.o'
+#
+#test:
+#  - '**/test/app.o'
+#  - '**/test/c.o'
+#  - '**/test/c/*.o'

res/data/template.libs.yml

@@ -131,25 +131,8 @@ export abstract class CodeBuilder {
         paramsModTime?: number;
     } {
 
-        const srcList: { path: string, virtualPath?: string; }[] = [];
         const srcParams: { [name: string]: string; } = {};
-        const fGoups = this.project.getFileGroups();
-        const filter = AbstractProject.getSourceFileFilter();
-
-        // filter source files
-        for (const group of fGoups) {
-            if (group.disabled) continue; // skip disabled group
-            for (const source of group.files) {
-                if (source.disabled) continue; // skip disabled file
-                if (!filter.some((reg) => reg.test(source.file.path))) continue; // skip non-source
-                const rePath = this.project.ToRelativePath(source.file.path);
-                const fInfo: any = { path: rePath || source.file.path }
-                if (AbstractProject.isVirtualSourceGroup(group)) {
-                    fInfo.virtualPath = `${group.name}/${source.file.name}`;
-                }
-                srcList.push(fInfo);
-            }
-        }
+        const srcList: { path: string, virtualPath?: string; }[] = this.project.getAllSources();
 
         // append user options for files
         try {
@@ -483,6 +466,25 @@ export abstract class CodeBuilder {
         // handle options
         this.preHandleOptions(builderOptions.options);
 
+        // gen libs.makefile
+        const mkfile = File.fromArray([this.project.ToAbsolutePath(outDir), 'libs.makefile']);
+        const mk_txt = this.project.genLibsMakefileContent(mkfile.name);
+        if (mk_txt) {
+            try {
+                mkfile.Write(mk_txt);
+                let command: any =  {
+                    name: 'make libs',
+                    command: `make --directory=./${outDir} --makefile=./${mkfile.name} all`
+                };
+                if (builderOptions.options.afterBuildTasks == undefined)
+                    builderOptions.options.afterBuildTasks = [];
+                builderOptions.options.afterBuildTasks = [command].concat(builderOptions.options.afterBuildTasks);
+            } catch (error) {
+                GlobalEvent.emit('msg', newMessage('Warning', `Generating '${mkfile.name}' failed !`));
+                GlobalEvent.emit('globalLog', ExceptionToMessage(error, 'Error'));
+            }
+        }
+
         // generate hash for compiler options
         builderOptions.sha = this.genHashFromCompilerOptions(builderOptions);
 

res/template/cosmic_stm8.ept

@@ -102,7 +102,7 @@ export class SevenZipper {
                 this._event.emit('progress', 20, line);
             });
 
-            process.Run('tar', paramList);
+            process.Run(this._tar_path(), paramList);
         });
     }
 
@@ -154,13 +154,25 @@ export class SevenZipper {
         });
     }
 
+    private _is_tar(path: string) {
+        return /\.tar$|\.tar\./.test(path);
+    }
+
+    private _tar_path(): string {
+        if (platform.osType() == 'win32') {
+            return ResManager.instance().getMsysBinToolPath('tar');
+        } else {
+            return 'tar';
+        }
+    }
+
     Unzip(zipFile: File, outDir?: File): Promise<Error | null> {
 
         if (!zipFile.IsFile()) {
             throw new Error('\'' + zipFile.path + '\' is not exist');
         }
 
-        if (platform.osType() != 'win32' && zipFile.suffix.startsWith('tar')) {
+        if (this._is_tar(zipFile.name)) {
             return this._unzip_tar(zipFile, outDir);
         } else {
             return this._unzip_zip_7z(zipFile, outDir);
@@ -174,15 +186,15 @@ export class SevenZipper {
         }
 
         // use tar
-        if (platform.osType() != 'win32' && zipFile.suffix.startsWith('tar')) {
+        if (this._is_tar(zipFile.name)) {
 
             let paramList: string[] = [];
 
             paramList.push('-xvf');
             paramList.push(zipFile.path);
             paramList.push('-C', outDir ? outDir.path : zipFile.dir);
 
-            return child_process.execFileSync('tar', paramList).toString();
+            return child_process.execFileSync(this._tar_path(), paramList).toString();
         }
         // use 7z
         else {

src/CodeBuilder.ts

@@ -196,18 +196,22 @@ class CortexDebugConfigProvider extends IDebugConfigProvider {
 
                 else if ('openocd' == debugConfig.servertype) {
                     const openocdConf = <OpenOCDFlashOptions>JSON.parse(JSON.stringify(prjConfig.uploadConfig));
+                    const cfgs: string[] = [];
 
-                    if (!openocdConf.interface.startsWith('${workspaceFolder}/')) {
-                        openocdConf.interface = `interface/${openocdConf.interface}`;
+                    if (openocdConf.interface) {
+                        if (!openocdConf.interface.startsWith('${workspaceFolder}/')) {
+                            openocdConf.interface = `interface/${openocdConf.interface}`;
+                        }
+                        cfgs.push(`${openocdConf.interface}.cfg`);
                     }
-                    if (!openocdConf.target.startsWith('${workspaceFolder}/')) {
-                        openocdConf.target = `target/${openocdConf.target}`;
+                    if (openocdConf.target) {
+                        if (!openocdConf.target.startsWith('${workspaceFolder}/')) {
+                            openocdConf.target = `target/${openocdConf.target}`;
+                        }
+                        cfgs.push(`${openocdConf.target}.cfg`);
                     }
 
-                    debugConfig.configFiles = [
-                        `${openocdConf.interface}.cfg`,
-                        `${openocdConf.target}.cfg`
-                    ];
+                    debugConfig.configFiles = cfgs;
                 }
 
                 else if ('jlink' == debugConfig.servertype) {