Skip to content

Commit 05897d1

Browse files
authored
v3.8.7 patch
1 parent 98ede7a commit 05897d1

3 files changed

Lines changed: 32 additions & 27 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
***
66

7-
### [v3.8.6] revision (v3.8.4/v3.8.5)
7+
### [v3.8.7] revision (v3.8.4 patch)
88

99
**New**:
1010
- Add `Exclude/Include Child Sources` context menu for source folder

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"homepage": "https://github.com/github0null/eide/blob/master/README.md",
3434
"license": "MIT",
3535
"description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/RISC-V",
36-
"version": "3.8.6",
36+
"version": "3.8.7",
3737
"preview": false,
3838
"engines": {
3939
"vscode": "^1.63.0"

src/EIDETypeDefine.ts

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,36 +1363,29 @@ export class ProjectConfiguration<T extends BuilderConfigData>
13631363

13641364
const eidePrjObj = <ProjectConfigData<T>>utility.deepCloneObject(this.config);
13651365

1366-
// handle data
1367-
{
1368-
//
1369-
// store target
1370-
//
1366+
//
1367+
// store target
1368+
//
13711369

1372-
eidePrjObj.targets[eidePrjObj.mode] = this.cloneCurrentTarget();
1370+
eidePrjObj.targets[eidePrjObj.mode] = this.cloneCurrentTarget();
13731371

1374-
const usrCtx = this.getProjectUsrCtx();
1375-
usrCtx.target = eidePrjObj.mode;
1376-
this.setProjectUsrCtx(usrCtx);
1377-
1378-
//
1379-
// convert abspath to relative path before save to file
1380-
//
1372+
//
1373+
// convert abspath to relative path before save to file
1374+
//
13811375

1382-
eidePrjObj.srcDirs = eidePrjObj.srcDirs.map((path) => { return this.toRelativePath(path); });
1376+
eidePrjObj.srcDirs = eidePrjObj.srcDirs.map((path) => { return this.toRelativePath(path); });
13831377

1384-
// ignore some 'dynamic' dependence
1385-
eidePrjObj.dependenceList = eidePrjObj.dependenceList.filter((g) => {
1386-
return g.groupName !== ProjectConfiguration.BUILD_IN_GROUP_NAME
1387-
&& g.groupName !== ProjectConfiguration.CUSTOM_GROUP_NAME;
1388-
});
1378+
// ignore some 'dynamic' dependence
1379+
eidePrjObj.dependenceList = eidePrjObj.dependenceList.filter((g) => {
1380+
return g.groupName !== ProjectConfiguration.BUILD_IN_GROUP_NAME
1381+
&& g.groupName !== ProjectConfiguration.CUSTOM_GROUP_NAME;
1382+
});
13891383

1390-
for (const depGroup of eidePrjObj.dependenceList) {
1391-
for (const dep of depGroup.depList) {
1392-
dep.incList = dep.incList.map((path) => { return this.toRelativePath(path); });
1393-
dep.libList = dep.libList.map((path) => { return this.toRelativePath(path); });
1394-
dep.sourceDirList = dep.sourceDirList.map((path) => { return this.toRelativePath(path); });
1395-
}
1384+
for (const depGroup of eidePrjObj.dependenceList) {
1385+
for (const dep of depGroup.depList) {
1386+
dep.incList = dep.incList.map((path) => { return this.toRelativePath(path); });
1387+
dep.libList = dep.libList.map((path) => { return this.toRelativePath(path); });
1388+
dep.sourceDirList = dep.sourceDirList.map((path) => { return this.toRelativePath(path); });
13961389
}
13971390
}
13981391

@@ -1408,6 +1401,18 @@ export class ProjectConfiguration<T extends BuilderConfigData>
14081401

14091402
return utility.ToJsonStringExclude(eidePrjObj, excKeys, 2);
14101403
}
1404+
1405+
Save(force?: boolean) {
1406+
1407+
const usrCtx = this.getProjectUsrCtx();
1408+
1409+
// save current target
1410+
usrCtx.target = this.config.mode;
1411+
1412+
this.setProjectUsrCtx(usrCtx);
1413+
1414+
super.Save();
1415+
}
14111416
}
14121417

14131418
// ======================== config base =============================

0 commit comments

Comments
 (0)