fix error: 'Not found required sub component'

Author: github0null

src/DependenceManager.ts

@@ -65,7 +65,9 @@ export class DependenceManager implements ManagerInterface {
     }
 
     InstallComponent(packName: string, component: Component) {
+        GlobalEvent.emit('globalLog.append', `[Info] Install CMSIS Component: ${component.groupName}\n`);
         this._installComponent(packName, component, [component.groupName]);
+        GlobalEvent.emit('globalLog.append', `[Info] Done.\n`);
     }
 
     private _installComponent(packName: string, component: Component, pendingList: string[]) {
@@ -77,25 +79,30 @@ export class DependenceManager implements ManagerInterface {
 
         /* 安装此组件的依赖项 */
         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.'))
+            const result = packageManager.CheckConditionRequire(component.condition, toolchain);
+            if (result == false)
+                throw new Error(`Condition '${component.condition}' is not fit for this component: '${component.groupName}'`);
+            if (Array.isArray(result)) {
+                for (const fullname of result) {
+                    if (!fullname.startsWith('Device.'))
                         continue; /* 排除非 Device 类型的组件 */
-                    if (this.isInstalled(packName, compName))
+                    const requiredName = fullname.replace('Device.', '');
+                    if (this.isInstalled(packName, requiredName))
                         continue; /* 排除已安装的 */
-                    if (pendingList.includes(compName))
+                    if (pendingList.includes(requiredName))
                         continue; /* 排除队列中已存在的 */ 
-                    const t = packageManager.FindComponent(compName);
-                    if (t) {
-                        pendingList.push(compName);
-                        this._installComponent(packName, t, pendingList);
-                        pendingList.pop();
+                    const compList = packageManager.FindAllComponents(requiredName);
+                    if (compList) {
+                        for (const item of compList) {
+                            pendingList.push(item.groupName);
+                            GlobalEvent.emit('globalLog.append', `[Info] ${' '.repeat(pendingList.length)}-> install dependence component: ${item.groupName}\n`);
+                            this._installComponent(packName, item, pendingList);
+                            pendingList.pop();
+                        }
                     } else {
-                        throw new Error(`Not found required sub component: '${comp}'`);
+                        //throw new Error(`Not found required sub component: '${comp}'`);
+                        GlobalEvent.emit('globalLog.append',
+                            `[Warn] ${' '.repeat(pendingList.length)}Not found required sub component: '${comp}'\n`);
                     }
                 }
             }

src/EIDEProjectModules.ts

@@ -62,8 +62,18 @@ export interface ComponentFileItem {
     path: string;
 }
 
+// XML define example:
+// ---
+//   <component Cgroup="Drivers" Csub="Touch Screen" condition="STM32F746G-Discovery BSP TS">
+//     <description>Touch Screen for STMicroelectronics STM32F746G-Discovery Kit</description>
+//     <files>
+//         <file category="header" name="Drivers/BSP/STM32746G-Discovery/stm32746g_discovery_ts.h"/>
+//         <file category="source" name="Drivers/BSP/STM32746G-Discovery/stm32746g_discovery_ts.c"/>
+//         <file category="source" name="Drivers/BSP/Components/ft5336/ft5336.c"/>
+//     </files>
+//   </component>
 export interface Component {
-    groupName: string;
+    groupName: string; // value is: ${Cgroup} + '.' + ${Csub}, and remove whitespace
     description?: string;
     enable: boolean;
     RTE_define?: string;

src/PackageManager.ts

@@ -1145,10 +1145,18 @@ export class PackageManager {
         return undefined;
     }
 
-    findComponents(groupName: string): Component[] | undefined {
+    FindAllComponents(matchName: string): Component[] | undefined {
         if (this.packList.length > 0) {
             return this.packList[0].components.filter((comp) => {
-                return comp.enable && comp.groupName === groupName;
+                if (!comp.enable)
+                    return false
+                // case 1: matchName == 'A' and comp.groupName == 'A'
+                if (comp.groupName === matchName)
+                    return true
+                // case 2: matchName == 'A' and comp.groupName == 'A.B.C'
+                if (comp.groupName.startsWith(matchName + '.'))
+                    return true;
+                return false
             });
         }
         return undefined;