Change comments

[bertos.git] / wizard / bertos_utils.py

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index bcb4a4afc6e29a404f5668f97aff0b5a9a4d35e4..700d72e7ef65087eb0b826cbed6e0be2c47137da 100644 (file)
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -133,16 +133,22 @@ def getToolchainInfo(output):
         info["thread"] = thread[0].split("Thread model: ")[1]
     return info
 
-def findDefinitions(ftype, path):
-    L = os.walk(path)
+def loadSourceTree(project):
+    fileList = [f for f in os.walk(project.info("SOURCES_PATH"))]
+    project.setInfo("FILE_LIST", fileList)
+
+def findDefinitions(ftype, project):
+    L = project.info("FILE_LIST")
+    definitions = []
     for element in L:
         for filename in element[2]:
             if fnmatch.fnmatch(filename, ftype):
-                yield (filename, element[0])
+                definitions.append((filename, element[0]))
+    return definitions
 
-def loadCpuInfos(path):
+def loadCpuInfos(project):
     cpuInfos = []
-    for definition in findDefinitions(const.CPU_DEFINITION, path):
+    for definition in findDefinitions(const.CPU_DEFINITION, project):
         cpuInfos.append(getInfos(definition))
     return cpuInfos
 
@@ -227,6 +233,18 @@ def loadConfigurationInfos(path):
     except SyntaxError:
         raise DefineException.ConfigurationDefineException(path, name)
 
+def loadConfigurationInfosDict(project):
+    """
+    Store in the project the configuration infos as a dict.
+    """
+    modules = project.info("MODULES")
+    configurations = {}
+    for module, informations in modules.items():
+        if len(informations["configuration"]) > 0:
+            configurations[informations["configuration"]] = loadConfigurationInfos(project.info("SOURCES_PATH") +
+                                                                                    "/" + informations["configuration"])
+    project.setInfo("CONFIGURATIONS", configurations)
+
 def loadModuleInfos(path):
     """
     Return the module infos found in the given file as a dict with the module
@@ -261,14 +279,14 @@ def loadModuleInfos(path):
     except SyntaxError:
         raise DefineException.ModuleDefineException(path)
 
-def loadModuleInfosDict(path):
+def loadModuleInfosDict(project):
     """
-    Return the dict containig all the modules
+    Store in the project the dict containig all the modules
     """
     moduleInfosDict = {}
-    for filename, path in findDefinitions("*.h", path):
+    for filename, path in findDefinitions("*.h", project):
         moduleInfosDict.update(loadModuleInfos(path + "/" + filename))
-    return moduleInfosDict
+    project.setInfo("MODULES", moduleInfosDict)
 
 def loadDefineLists(path):
     """
@@ -288,14 +306,17 @@ def loadDefineLists(path):
     except SyntaxError:
         raise DefineException.EnumDefineException(path)
 
-def loadDefineListsDict(path):
+def loadDefineListsDict(project):
     """
-    Return the dict containing all the define lists
+    Store in the project the dict containing all the define lists
     """
     defineListsDict = {}
-    for filename, path in findDefinitions("*.h", path):
+    for filename, path in findDefinitions("*.h", project):
         defineListsDict.update(loadDefineLists(path + "/" + filename))
-    return defineListsDict
+    lists = project.info("LISTS")
+    if lists is not None:
+        defineListsDict.update(lists)
+    project.setInfo("LISTS", defineListsDict)
 
 def sub(string, parameter, value):
     """