@@ -789,21 +789,16 @@ class ARMParser extends KeilParser<KeilARMOption> {
789
789
}
790
790
if ( total_cnt > 0 ) {
791
791
// Copy files to compate Keil User Commands
792
- if ( env [ 'KEIL_OUTPUT_NAME' ] ) {
793
- eideOption . afterBuildTasks . splice ( 0 , 0 , {
794
- "name" : '[Copy linker output for Keil User Commands]' ,
795
- "command" : `$<cd:mdk-proj-dir> && mkdir \${KEIL_OUTPUT_DIR} & copy "\${OutDir}\\\${ProjectName}.axf" "\${KEIL_OUTPUT_DIR}\\\${KEIL_OUTPUT_NAME}.axf"` ,
796
- "disable" : actived_cnt == 0 ,
797
- "abortAfterFailed" : true
798
- } ) ;
799
- } else {
800
- eideOption . afterBuildTasks . splice ( 0 , 0 , {
801
- "name" : '[Copy linker output for Keil User Commands]' ,
802
- "command" : `$<cd:mdk-proj-dir> && mkdir \${KEIL_OUTPUT_DIR} & copy "\${OutDir}\\\${ProjectName}.axf" "\${KEIL_OUTPUT_DIR}\\\${ProjectName}.axf"` ,
803
- "disable" : actived_cnt == 0 ,
804
- "abortAfterFailed" : true
805
- } ) ;
792
+ const copyFilesCmd = {
793
+ "name" : '[Copy linker output for Keil User Commands]' ,
794
+ "command" : `$<cd:mdk-proj-dir> && mkdir \${KEIL_OUTPUT_DIR} & copy "\${OutDir}\\\${ProjectName}.axf" "\${KEIL_OUTPUT_DIR}\\\${KEIL_OUTPUT_NAME}.axf"` ,
795
+ "disable" : actived_cnt == 0 ,
796
+ "abortAfterFailed" : true
797
+ } ;
798
+ if ( ! env [ 'KEIL_OUTPUT_NAME' ] ) {
799
+ copyFilesCmd [ 'command' ] = copyFilesCmd [ 'command' ] . replace ( '${KEIL_OUTPUT_NAME}' , '${ProjectName}' ) ;
806
800
}
801
+ eideOption . afterBuildTasks . splice ( 0 , 0 , copyFilesCmd ) ;
807
802
}
808
803
if ( mdk_CreateLib ) {
809
804
// Make eide output lib instead of elf
0 commit comments