import keil User Tasks

Author: github0null

src/EIDEProjectExplorer.ts

@@ -3045,6 +3045,11 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem>, vsco
             return baseOpts;
         }
 
+        const replaceUserTaskTmpVar = (t: any) => {
+            const reKeilPrjDir = baseInfo.rootFolder.ToRelativeLocalPath(keilPrjFile.dir) || keilPrjFile.dir;
+            t.command = t.command.replace('$<cd:mdk-proj-dir>', `cd .\\${reKeilPrjDir}`);
+        }
+
         // init all targets
         for (const keilTarget of targets) {
 
@@ -3072,7 +3077,8 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem>, vsco
                     defIncList.push(baseInfo.rootFolder.ToRelativePath(absPath) || absPath);
                 }
                 // import builder options
-                const opts = mergeBuilderOpts(toolchain.getDefaultConfig(), keilCompileConf.optionsGroup[keilCompileConf.toolchain]);
+                const opts: ICompileOptions = mergeBuilderOpts(toolchain.getDefaultConfig(), keilCompileConf.optionsGroup[keilCompileConf.toolchain]);
+                // write to file
                 const cfgFile = File.fromArray([baseInfo.rootFolder.path, AbstractProject.EIDE_DIR, `${keilTarget.name.toLowerCase()}.${toolchain.configName}`]);
                 cfgFile.Write(JSON.stringify(opts, undefined, 4));
             }
@@ -3097,7 +3103,11 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem>, vsco
 
                 // import builder options
                 const toolchain = ToolchainManager.getInstance().getToolchain('ARM', keilCompileConf.toolchain);
-                const opts = mergeBuilderOpts(toolchain.getDefaultConfig(), keilCompileConf.optionsGroup[keilCompileConf.toolchain]);
+                const opts: ICompileOptions = mergeBuilderOpts(toolchain.getDefaultConfig(), keilCompileConf.optionsGroup[keilCompileConf.toolchain]);
+                opts.beforeBuildTasks?.forEach((t) => replaceUserTaskTmpVar(t));
+                opts.afterBuildTasks?.forEach((t) => replaceUserTaskTmpVar(t));
+
+                // write to file
                 const cfgFile = File.fromArray([baseInfo.rootFolder.path, AbstractProject.EIDE_DIR, `${keilTarget.name.toLowerCase()}.${toolchain.configName}`]);
                 cfgFile.Write(JSON.stringify(opts, undefined, 4));
             }

src/KeilXmlParser.ts

@@ -699,6 +699,60 @@ class ARMParser extends KeilParser<KeilARMOption> {
                 }
             }
 
+            // parse builder tasks
+            {
+                const commonOption = targetOptionObj.TargetCommonOption;
+                const eideOption = option.optionsGroup[option.toolchain];
+
+                if (eideOption.beforeBuildTasks == undefined)
+                    eideOption.beforeBuildTasks = [];
+                if (eideOption.afterBuildTasks == undefined)
+                    eideOption.afterBuildTasks = [];
+
+                // (%|#|@|\!|\$)
+                const replaceMdkEnv = (cmd: string) => cmd
+                    .replace(/\$(H|L)\b/g, '${OutDir}\\')
+                    .replace(/@(H|L)\b/g, '${ProjectName}')
+                    .replace(/#H\b/g, '${ExecutableName}.hex')
+                    .replace(/%H\b/g, '${ProjectName}.hex')
+                    .replace(/\!H\b/g, '.\\${OutDirBase}\\${ProjectName}.hex')
+                    .replace(/#L\b/g, '${ExecutableName}.axf')
+                    .replace(/%L\b/g, '${ProjectName}.axf')
+                    .replace(/\!L\b/g, '.\\${OutDirBase}\\${ProjectName}.axf');
+
+                // BeforeMake
+                const beforeMake = commonOption.BeforeMake;
+                if (beforeMake) {
+                    for (let idx = 1; idx < 3; idx++) {
+                        let cmd = beforeMake[`UserProg${idx}Name`];
+                        if (cmd) {
+                            eideOption.beforeBuildTasks.push({
+                                "name": cmd,
+                                "command": `$<cd:mdk-proj-dir> && ${replaceMdkEnv(cmd)}`,
+                                "disable": beforeMake[`RunUserProg${idx}`] != '1',
+                                "abortAfterFailed": true,
+                                "stopBuildAfterFailed": true
+                            });
+                        }
+                    }
+                }
+                // AfterMake
+                const afterMake = commonOption.AfterMake;
+                if (afterMake) {
+                    for (let idx = 1; idx < 3; idx++) {
+                        let cmd = afterMake[`UserProg${idx}Name`];
+                        if (cmd) {
+                            eideOption.afterBuildTasks.push({
+                                "name": cmd,
+                                "command": `$<cd:mdk-proj-dir> && ${replaceMdkEnv(cmd)}`,
+                                "disable": afterMake[`RunUserProg${idx}`] != '1',
+                                "abortAfterFailed": true
+                            });
+                        }
+                    }
+                }
+            }
+
             // parse misc options
             {
                 const ccMiscOpts = armAdsObj.Cads.VariousControls.MiscControls;