安装组件时自动安装依赖项

github0null · github0null · commit 40493d60e5a8 · 2024-06-16T18:31:31.000+08:00
diff --git a/src/DependenceManager.ts b/src/DependenceManager.ts
@@ -65,12 +65,42 @@ export class DependenceManager implements ManagerInterface {
     }
 
     InstallComponent(packName: string, component: Component) {
+        this._installComponent(packName, component, [component.groupName]);
+    }
+
+    private _installComponent(packName: string, component: Component, pendingList: string[]) {
 
         const config         = this.project.GetConfiguration();
         const toolchain      = this.project.getToolchain();
         const packageManager = this.project.GetPackManager();
         const vSource        = this.project.getVirtualSourceManager();
 
+        /* 安装此组件的依赖项 */
+        if (component.condition) {
+            const r = packageManager.CheckConditionRequire(component.condition, toolchain);
+            if (r == false)
+                throw new Error(`This condition '${component.condition}' is not met for component: '${component.groupName}'`);
+            if (Array.isArray(r)) {
+                for (const comp of r) {
+                    const compName = comp.replace('Device.', '');
+                    if (!comp.startsWith('Device.'))
+                        continue; /* 排除非 Device 类型的组件 */
+                    if (this.isInstalled(packName, compName))
+                        continue; /* 排除已安装的 */
+                    if (pendingList.includes(compName))
+                        continue; /* 排除队列中已存在的 */ 
+                    const t = packageManager.FindComponent(compName);
+                    if (t) {
+                        pendingList.push(compName);
+                        this._installComponent(packName, t, pendingList);
+                        pendingList.pop();
+                    } else {
+                        throw new Error(`Not found required sub component: '${comp}'`);
+                    }
+                }
+            }
+        }
+
         const item_filter = function (item: ComponentFileItem): boolean {
             return (item.attr != 'template')
                 && (item.condition ? packageManager.CheckCondition(item.condition, toolchain) : true);
@@ -83,6 +113,7 @@ export class DependenceManager implements ManagerInterface {
         const linkerList = component.linkerList?.filter(item_filter);
 
         const conditionList: Set<string> = new Set();
+        const includeList: string[] = component.incDirList.map(item => item.path);
 
         // copy file
         asmList.forEach((item) => {
@@ -96,6 +127,8 @@ export class DependenceManager implements ManagerInterface {
             }
         });
         headerList.forEach((item) => {
+            if (includeList.findIndex(p => File.isSubPathOf(p, item.path)) == -1)
+                includeList.push(NodePath.dirname(item.path));
             if (item.condition) {
                 conditionList.add(item.condition);
             }
@@ -115,10 +148,9 @@ export class DependenceManager implements ManagerInterface {
         // add condiions to cache
         this.addComponentCache(packName, component.groupName, Array.from(conditionList));
 
-        const incList = component.incDirList.map(item => item.path);
         const dep: Dependence = {
             name: component.groupName,
-            incList: incList,
+            incList: includeList,
             libList: component.libList ? component.libList.map<string>((item) => { return item.path; }) : [],
             defineList: component.defineList || []
         };
diff --git a/src/EIDEProject.ts b/src/EIDEProject.ts
@@ -1369,7 +1369,11 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
         if (device) {
             const component = this.packManager.FindComponent(name);
             if (component) {
-                this.dependenceManager.InstallComponent(device.packInfo.name, component);
+                try {
+                    this.dependenceManager.InstallComponent(device.packInfo.name, component);
+                } catch (error) {
+                    GlobalEvent.emit('msg', ExceptionToMessage(error, 'Warning'));
+                }
             }
         }
     }
@@ -2765,7 +2769,11 @@ class EIDEProject extends AbstractProject {
                         if (compItem.state === ComponentUpdateType.Expired) { // if need reinstalled
                             const comp = this.packManager.FindComponent(compItem.name);
                             if (comp) {
-                                this.dependenceManager.InstallComponent(packInfo.name, comp);
+                                try {
+                                    this.dependenceManager.InstallComponent(packInfo.name, comp);
+                                } catch (error) {
+                                    GlobalEvent.emit('globalLog', ExceptionToMessage(error, 'Warning'));
+                                }
                             }
                         }
 
diff --git a/src/EIDEProjectExplorer.ts b/src/EIDEProjectExplorer.ts
@@ -6288,6 +6288,8 @@ export class ProjectExplorer implements CustomConfigurationProvider {
             for (const dep of group.depList) {
                 for (const incPath of dep.incList) {
                     const repath = prj.toRelativePath(incPath);
+                    if (includes.includes(repath))
+                        continue; // skip it existed
                     includes.push(repath);
                     includesMap.set(repath, group.groupName);
                 }
diff --git a/src/EIDEProjectModules.ts b/src/EIDEProjectModules.ts
@@ -98,6 +98,7 @@ export interface Condition {
     Dname?: RegExp;
     compiler?: string;
     compilerOption?: string;
+    component?: string;
 }
 
 export interface ConditionGroup {
diff --git a/src/PackageManager.ts b/src/PackageManager.ts
@@ -40,6 +40,7 @@ import { AbstractProject } from './EIDEProject';
 import { ExceptionToMessage, newMessage } from './Message';
 import { ResManager } from './ResManager';
 import { ExeCmd } from '../lib/node-utility/Executable';
+import { ArrayDelRepetition } from '../lib/node-utility/Utility';
 
 export enum ComponentUpdateType {
     Disabled = 1,
@@ -326,7 +327,7 @@ export class PackageManager {
     }
 
     private _checkConditionGroup(gMap: ConditionMap,
-        cGroup: ConditionGroup, cDev: CurrentDevice, toolchain?: IToolchian): boolean {
+        cGroup: ConditionGroup, cDev: CurrentDevice, comp_requires: string[], toolchain?: IToolchian): boolean {
 
         const familyInfo = cDev.packInfo.familyList[cDev.familyIndex];
         const devInfo = this.getCurrentDevInfo(cDev);
@@ -356,11 +357,15 @@ export class PackageManager {
                 return false;
             }
 
+            if (con.component) {
+                comp_requires.push(con.component);
+            }
+
             if (con.condition && !this._recurseList.includes(con.condition)) {
                 const _group = gMap.get(con.condition);
                 if (_group) {
                     this._recurseList.push(con.condition);
-                    if (!this._checkConditionGroup(gMap, _group, cDev, toolchain)) {
+                    if (!this._checkConditionGroup(gMap, _group, cDev, comp_requires, toolchain)) {
                         return false;
                     }
                 }
@@ -413,7 +418,7 @@ export class PackageManager {
                 const _group = gMap.get(con.condition);
                 if (_group) {
                     this._recurseList.push(con.condition);
-                    if (this._checkConditionGroup(gMap, _group, cDev, toolchain)) {
+                    if (this._checkConditionGroup(gMap, _group, cDev, comp_requires, toolchain)) {
                         passCount++;
                     }
                 } else {
@@ -438,13 +443,36 @@ export class PackageManager {
             const cGroup = cMap.get(conditionName);
             if (cGroup) {
                 this._recurseList = [conditionName];
-                return this._checkConditionGroup(cMap, cGroup, this.currentDevice, toolchain);
+                return this._checkConditionGroup(cMap, cGroup, this.currentDevice, [], toolchain);
             }
         }
 
         return true;
     }
 
+    CheckConditionRequire(conditionName: string, toolchain: IToolchian): string[] | boolean {
+
+        if (this.currentDevice) {
+            const cMap = this.currentDevice.packInfo.conditionMap;
+            const cGroup = cMap.get(conditionName);
+            if (cGroup) {
+                this._recurseList = [conditionName];
+                const components: string[] = [];
+                const pass = this._checkConditionGroup(cMap, cGroup, this.currentDevice, components, toolchain);
+                return pass ? ArrayDelRepetition(components) : false;
+            }
+        }
+
+        return true;
+    }
+
+    makeComponentGroupName(...names: string[]): string {
+        return names
+            .filter(n => n !== undefined)
+            .join('.')
+            .replace(/\s+/g, '');
+    }
+
     private _preHandleSubfamily(family: any) {
         let _subFamilyList: any[] = [];
         for (const subFamily of (<any[]>family.subFamily)) {
@@ -957,7 +985,7 @@ export class PackageManager {
         for (let component of componentList) {
 
             const item: Component = {
-                groupName: component.$Cgroup + (component.$Csub ? ('.' + component.$Csub) : ''),
+                groupName: this.makeComponentGroupName(component.$Cgroup, component.$Csub),
                 enable: false,
                 description: component.description,
                 incDirList: [],
@@ -969,8 +997,6 @@ export class PackageManager {
                 condition: component.$condition
             };
 
-            item.groupName = item.groupName.replace(/\s+/g, '');
-
             /* category component's files */
 
             if (Array.isArray(component.files.file)) {
@@ -984,14 +1010,15 @@ export class PackageManager {
 
                     switch (f.$category) {
                         case 'include':
-                            if (/\.(?:h|hpp|hxx|inc)$/.test(f.$name)) {
+                            if (AbstractProject.headerFilter.test(f.$name)) {
                                 item.headerList.push(comp_item);
                             } else {
                                 item.incDirList.push(comp_item);
                             }
                             break;
                         case 'header':
-                            item.headerList.push(comp_item);
+                            if (AbstractProject.headerFilter.test(f.$name))
+                                item.headerList.push(comp_item);
                             break;
                         case 'source':
                         case 'library':
@@ -1075,6 +1102,9 @@ export class PackageManager {
                                     .replace(/\?/g, '.')
                                     .replace(/\*/g, '.*?'), 'i');
                             }
+                            if (require.$Cclass && require.$Cgroup) {
+                                condition.component = this.makeComponentGroupName(require.$Cclass, require.$Cgroup, require.$Csub);
+                            }
 
                             if (Object.keys(condition).length > 0) {
                                 cGroup.requireList.push(condition);

Original file line number	Diff line number	Diff line change
`@@ -1369,7 +1369,11 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr`
`1369`	`1369`	`if (device) {`
`1370`	`1370`	`const component = this.packManager.FindComponent(name);`
`1371`	`1371`	`if (component) {`
`1372`		`- this.dependenceManager.InstallComponent(device.packInfo.name, component);`
	`1372`	`+ try {`
	`1373`	`+ this.dependenceManager.InstallComponent(device.packInfo.name, component);`
	`1374`	`+ } catch (error) {`
	`1375`	`+ GlobalEvent.emit('msg', ExceptionToMessage(error, 'Warning'));`
	`1376`	`+ }`
`1373`	`1377`	`}`
`1374`	`1378`	`}`
`1375`	`1379`	`}`
`@@ -2765,7 +2769,11 @@ class EIDEProject extends AbstractProject {`
`2765`	`2769`	`if (compItem.state === ComponentUpdateType.Expired) { // if need reinstalled`
`2766`	`2770`	`const comp = this.packManager.FindComponent(compItem.name);`
`2767`	`2771`	`if (comp) {`
`2768`		`- this.dependenceManager.InstallComponent(packInfo.name, comp);`
	`2772`	`+ try {`
	`2773`	`+ this.dependenceManager.InstallComponent(packInfo.name, comp);`
	`2774`	`+ } catch (error) {`
	`2775`	`+ GlobalEvent.emit('globalLog', ExceptionToMessage(error, 'Warning'));`
	`2776`	`+ }`
`2769`	`2777`	`}`
`2770`	`2778`	`}`
`2771`	`2779`
Original file line number	Diff line number	Diff line change
`@@ -6288,6 +6288,8 @@ export class ProjectExplorer implements CustomConfigurationProvider {`
`6288`	`6288`	`for (const dep of group.depList) {`
`6289`	`6289`	`for (const incPath of dep.incList) {`
`6290`	`6290`	`const repath = prj.toRelativePath(incPath);`
	`6291`	`+ if (includes.includes(repath))`
	`6292`	`+ continue; // skip it existed`
`6291`	`6293`	`includes.push(repath);`
`6292`	`6294`	`includesMap.set(repath, group.groupName);`
`6293`	`6295`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,7 @@ export interface Condition {`
`98`	`98`	`Dname?: RegExp;`
`99`	`99`	`compiler?: string;`
`100`	`100`	`compilerOption?: string;`
	`101`	`+ component?: string;`
`101`	`102`	`}`
`102`	`103`
`103`	`104`	`export interface ConditionGroup {`