Make smarter the selection of the header to parse

[bertos.git] / wizard / bertos_utils.py

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index bcb4a4afc6e29a404f5668f97aff0b5a9a4d35e4..7e16c1bf11aede8741bc3005fe736cd6bac3c1b9 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
 
@@ -158,6 +164,23 @@ def getInfos(definition):
     del D["include"]
     return D
 
+def loadModuleData(project):
+    moduleInfosDict = {}
+    listInfosDict = {}
+    configurationsInfoDict = {}
+    for filename, path in findDefinitions("*.h", project):
+        moduleInfos, listInfos, configurationInfos= loadModuleInfos(path + "/" + filename)
+        moduleInfosDict.update(moduleInfos)
+        listInfosDict.update(listInfos)
+        for configuration in configurationInfos.keys():
+            configurationsInfoDict[configuration] = loadConfigurationInfos(project.info("SOURCES_PATH") + "/" + configuration)
+    print "*_" + project.info("CPU_INFOS")["TOOLCHAIN"] + ".h"
+    for filename, path in findDefinitions("*_" + project.info("CPU_INFOS")["TOOLCHAIN"] + ".h", project):
+        listInfosDict.update(loadDefineLists(path + "/" + filename))
+    project.setInfo("MODULES", moduleInfosDict)
+    project.setInfo("LISTS", listInfosDict)
+    project.setInfo("CONFIGURATIONS", configurationsInfoDict)
+
 def getDefinitionBlocks(text):
     """
     Take a text and return a list of tuple (description, name-value).
@@ -227,6 +250,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
@@ -240,35 +275,43 @@ def loadModuleInfos(path):
     """
     try:
         moduleInfos = {}
+        listInfos = {}
+        configurationsInfos = {}
         string = open(path, "r").read()
         commentList = re.findall(r"/\*{2}\s*([^*]*\*(?:[^/*][^*]*\*+)*)/", string)
         commentList = [" ".join(re.findall(r"^\s*\*?\s*(.*?)\s*?(?:/{2}.*?)?$", comment, re.MULTILINE)).strip() for comment in commentList]
-        for comment in commentList:
-            index = comment.find("$WIZARD_MODULE")
-            if index != -1:
-                exec(comment[index + 1:])
-                moduleInfos[WIZARD_MODULE["name"]] = {"depends": WIZARD_MODULE["depends"],
-                                                        "configuration": WIZARD_MODULE["configuration"],
-                                                        "description": "",
-                                                        "enabled": False}
-                index = comment.find("\\brief")
+        if len(commentList) > 0:
+            comment = commentList[0]
+            if comment.find("$WIZARD_MODULE") != -1:
+                index = comment.find("$WIZARD_MODULE")
                 if index != -1:
-                    description = comment[index + 7:]
-                    description = description[:description.find(" * ")]
-                    moduleInfos[WIZARD_MODULE["name"]]["description"] = description
-                return moduleInfos
-        return {}
+                    # 14 is the length of "$WIZARD_MODULE"
+                    if len(comment[index + 14:].strip()) > 0:
+                        exec(comment[index + 1:])
+                        moduleInfos[WIZARD_MODULE["name"]] = {"depends": WIZARD_MODULE["depends"],
+                                                                "configuration": WIZARD_MODULE["configuration"],
+                                                                "description": "",
+                                                                "enabled": False}
+                        index = comment.find("\\brief")
+                        if index != -1:
+                            description = comment[index + 7:]
+                            description = description[:description.find(" * ")]
+                            moduleInfos[WIZARD_MODULE["name"]]["description"] = description
+                        if "configuration" in WIZARD_MODULE.keys() and len(WIZARD_MODULE["configuration"]) > 0:
+                            configurationsInfos[WIZARD_MODULE["configuration"]] = {}
+                    listInfos.update(loadDefineLists(path))
+        return moduleInfos, listInfos, configurationsInfos
     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 +331,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):
     """