modified: tools/ci/bsp_buildings.py

Author: hydevcode

tools/ci/bsp_buildings.py

@@ -100,7 +100,32 @@ def check_scons_args(file_path):
                 args.append(match.group(1).strip())
     return ' '.join(args)
 
-
+def get_details_and_dependencies(details, projects, seen=None):
+    if seen is None:
+        seen = set()
+    result = []
+    scons_arg = []
+    if details is not None:
+        for dep in details:
+            if dep not in seen:
+                dep_details=projects.get(dep)
+                seen.add(dep) 
+                if dep_details is not None:
+                    if dep_details.get('depends') is not None:
+                        temp,temp1=get_details_and_dependencies(dep_details.get('depends'), projects, seen)
+                        for line in temp:
+                            result.append(line)
+                        for line in temp1:
+                            scons_arg.append(line)
+                    if dep_details.get('kconfig') is not None:   
+                        for line in dep_details.get('kconfig'):
+                            result.append(line)
+                    if dep_details.get('depend_scons_arg') is not None:   
+                        for line in dep_details.get('depend_scons_arg'):
+                            scons_arg.append(line)
+            else:
+                print(f"::error::There are some problems with attachconfig depend: {dep}");
+    return result,scons_arg
 def build_bsp_attachconfig(bsp, attach_file):
     """
     build bsp with attach config.
@@ -160,35 +185,46 @@ def build_bsp_attachconfig(bsp, attach_file):
         print("::endgroup::")
 
         yml_files_content = []
-        directory = os.path.join(rtt_root, 'bsp', bsp, '.ci/attachconfig')
+        directory = os.path.join(rtt_root, '.ci/attachconfig')
         if os.path.exists(directory):
             for root, dirs, files in os.walk(directory):
                 for filename in files:
                     if filename.endswith('attachconfig.yml'):
                         file_path = os.path.join(root, filename)
                         if os.path.exists(file_path):
-                            with open(file_path, 'r') as file:
-                                content = yaml.safe_load(file)
-                                yml_files_content.append(content)
+                            try:
+                                with open(file_path, 'r') as file:
+                                    content = yaml.safe_load(file)
+                                    if content is None:
+                                        continue
+                                    yml_files_content.append(content)
+                            except yaml.YAMLError as e:
+                                print(f"::error::Error parsing YAML file: {e}")
+                                continue
+                            except Exception as e:
+                                print(f"::error::Error reading file: {e}")
+                                continue
 
         config_file = os.path.join(rtt_root, 'bsp', bsp, '.config')
 
         for projects in yml_files_content:
             for name, details in projects.items():
-                for line in details.get('depends'):
-                    depends_item=projects.get(line)
-                    if(depends_item):
-                        for depends_line in depends_item.get('kconfig'):
-                            details['kconfig'].append(depends_line)
                 count += 1
                 config_bacakup = config_file+'.origin'
                 shutil.copyfile(config_file, config_bacakup)
                 with open(config_file, 'a') as destination:
-                    for line in details.get('kconfig'):
-                        print(f"::group::\t{line}")
-                        destination.write(line + '\n')
-                scons_arg = details.get('scons_arg')
-                scons_arg_str = scons_arg[0] if scons_arg else ' '
+                    if(projects.get(name) is not None):
+                        result_list,scons_arg_list=get_details_and_dependencies([name],projects)
+                        for line in result_list:
+                            destination.write(line + '\n')
+                scons_arg=[]
+                if details.get('scons_arg') is not None:
+                    for line in details.get('scons_arg'):
+                        scons_arg.append(line)
+                if scons_arg_list is not None:
+                    for line in scons_arg_list:
+                        scons_arg.append(line)
+                scons_arg_str=' '.join(scons_arg) if scons_arg else ' '
                 print(f"::group::\tCompiling yml project: =={count}==={name}=scons_arg={scons_arg_str}==")
                 res = build_bsp(bsp, scons_arg_str)
                 if not res: