File tree Expand file tree Collapse file tree 2 files changed +6
-1
lines changed
Expand file tree Collapse file tree 2 files changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -21,7 +21,6 @@ export async function doMigration(projectRootDir: File) {
2121 if ( eideJsonFile . IsExist ( ) ) {
2222 const obj = ProjectConfiguration . parseProjectFile ( eideJsonFile . Read ( ) ) ;
2323 projCfgFile . Write ( ProjectConfiguration . dumpProjectFile ( obj ) ) ;
24- fs . unlinkSync ( eideJsonFile . path ) ;
2524 }
2625
2726 const prjCfg = ProjectConfiguration . parseProjectFile ( projCfgFile . Read ( ) ) ;
@@ -64,4 +63,8 @@ export async function doMigration(projectRootDir: File) {
6463 const p = NodePath . join ( projectRootDir . path , '.eide.usr.ctx.json' ) ;
6564 if ( File . IsFile ( p ) )
6665 try { fs . unlinkSync ( p ) ; } catch ( error ) { }
66+
67+ // rm old eide.json file
68+ if ( eideJsonFile . IsExist ( ) )
69+ fs . unlinkSync ( eideJsonFile . path ) ;
6770}
Original file line number Diff line number Diff line change @@ -1406,6 +1406,7 @@ export class ProjectConfiguration<T extends BuilderConfigData>
14061406 }
14071407 target . compileConfig = target . compileConfigMap [ target . toolchain ] ;
14081408 target . uploadConfig = target . uploadConfigMap [ target . uploader ] ;
1409+ target . cppPreprocessAttrs . name = 'default' ;
14091410 }
14101411 return cfg ;
14111412 }
@@ -1427,6 +1428,7 @@ export class ProjectConfiguration<T extends BuilderConfigData>
14271428 target . compileConfigMap [ toolchain ] . options = target . builderOptions [ toolchain ] ;
14281429 }
14291430 target . builderOptions = < any > undefined ;
1431+ target . cppPreprocessAttrs . name = < any > undefined ;
14301432 }
14311433
14321434 // convert abspath to relative path before save to file
You can’t perform that action at this time.
0 commit comments