optimize keil proj importer

Author: github0null

src/EIDEProjectExplorer.ts

@@ -1154,7 +1154,7 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem>, vsco
                         const _depsFolder = project
                             .getVirtualSourceManager()
                             .getFolder(`${VirtualSource.rootName}/${DependenceManager.DEPS_VFOLDER_NAME}`);
-                        if (_depsFolder && (_depsFolder.files.length +_depsFolder.folders.length) > 0) {
+                        if (_depsFolder && (_depsFolder.files.length + _depsFolder.folders.length) > 0) {
                             const folderDispName = view_str$project$cmsis_components;
                             const itemType = TreeItemType.V_FOLDER_ROOT;
                             const vFolderPath = `${VirtualSource.rootName}/${_depsFolder.name}`;
@@ -3135,10 +3135,15 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem>, vsco
 
         const replaceUserTaskTmpVar = (t: any) => {
             const reKeilPrjDir = baseInfo.rootFolder.ToRelativeLocalPath(keilPrjFile.dir) || keilPrjFile.dir;
-            if (reKeilPrjDir === '.')
+            if (reKeilPrjDir === '.') {
                 t.command = t.command.replace('$<cd:mdk-proj-dir> && ', '');
-            else
-                t.command = t.command.replace('$<cd:mdk-proj-dir>', `cd .\\${reKeilPrjDir}`);
+            } else {
+                if (t.command.startsWith('bash')) {
+                    t.command = t.command.replace('$<cd:mdk-proj-dir>', `cd ${File.ToUnixPath(reKeilPrjDir)}`);
+                } else {
+                    t.command = t.command.replace('$<cd:mdk-proj-dir>', `cd .\\${reKeilPrjDir}`);
+                }
+            }
         }
 
         // project env
@@ -7013,7 +7018,7 @@ export class ProjectExplorer implements CustomConfigurationProvider {
     }
 
     private async genDebugConfig_internal(
-        type: 'jlink' | 'openocd' | 'pyocd', 
+        type: 'jlink' | 'openocd' | 'pyocd',
         prj: AbstractProject, old_cfgs: any[]): Promise<{ debug_config: any, override_idx: number } | undefined> {
 
         const _elfPath = File.ToUnixPath(prj.getOutputDir()) + '/' + `${prj.getProjectName()}.elf`;

src/KeilXmlParser.ts

@@ -743,6 +743,8 @@ class ARMParser extends KeilParser<KeilARMOption> {
 
                 // keil props
                 const mdk_OutputDirectory: string = File.normalize(commonOption.OutputDirectory || '.');
+                const mdk_CreateHexFile: boolean  = commonOption.CreateHexFile == '1';
+                const mdk_CreateLib: boolean      = commonOption.CreateLib == '1';
 
                 // BeforeMake
                 const beforeMake = commonOption.BeforeMake;
@@ -784,23 +786,27 @@ class ARMParser extends KeilParser<KeilARMOption> {
                         if (env['KEIL_OUTPUT_NAME']) {
                             eideOption.afterBuildTasks.splice(0, 0, {
                                 "name": '[Copy linker output for Keil User Commands]',
-                                "command": `$<cd:mdk-proj-dir> && copy "\${OutDir}\\\${ProjectName}.axf" "${mdk_OutputDirectory}\\\${KEIL_OUTPUT_NAME}.axf"`,
+                                "command": `$<cd:mdk-proj-dir> && mkdir ${mdk_OutputDirectory} & copy "\${OutDir}\\\${ProjectName}.axf" "${mdk_OutputDirectory}\\\${KEIL_OUTPUT_NAME}.axf"`,
                                 "disable": actived_cnt == 0,
                                 "abortAfterFailed": true
                             });
                         } else {
                             eideOption.afterBuildTasks.splice(0, 0, {
                                 "name": '[Copy linker output for Keil User Commands]',
-                                "command": `$<cd:mdk-proj-dir> && copy "\${OutDir}\\\${ProjectName}.axf" "${mdk_OutputDirectory}\\\${ProjectName}.axf"`,
+                                "command": `$<cd:mdk-proj-dir> && mkdir ${mdk_OutputDirectory} & copy "\${OutDir}\\\${ProjectName}.axf" "${mdk_OutputDirectory}\\\${ProjectName}.axf"`,
                                 "disable": actived_cnt == 0,
                                 "abortAfterFailed": true
                             });
                         }
                     }
-                    if (actived_cnt > 0) {
+                    if (mdk_CreateLib) {
+                        // Make eide output lib instead of elf
+                        if (eideOption.linker == undefined) eideOption.linker = {};
+                        eideOption.linker['output-format'] = 'lib';
+                    }
+                    if (!mdk_CreateHexFile) {
                         // Make eide Don't output hex/bin
-                        if (eideOption.linker == undefined)
-                            eideOption.linker = {};
+                        if (eideOption.linker == undefined) eideOption.linker = {};
                         eideOption.linker['$disableOutputTask'] = true;
                     }
                 }