X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos_utils.py;h=a50df0f49e0eb5ac49288d6e2dbfcf2fc3dc06f6;hb=a32c2b3896360b7d3ed8360c3fc49c96c37ebc5a;hp=89998949b1952aa7adfaeeccc63dd573a174f8e3;hpb=b1ba8881d40708e05b49ae5e42661a53c149c26c;p=bertos.git

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index 89998949..a50df0f4 100644
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -41,7 +41,7 @@ def findToolchains(pathList):
         for toolchain in glob.glob(element+ "/" + const.GCC_NAME):
             if not os.path.islink(toolchain):
                 toolchains.append(toolchain)
-    return toolchains
+    return list(set(toolchains))
 
 def getToolchainInfo(output):
     info = {}
@@ -91,4 +91,23 @@ def getInfos(definition):
     include(definition[0], D)
     D["CPU_NAME"] = definition[0].split(".")[0]
     D["DEFINITION_PATH"] = definition[1] + "/" + definition[0]
-    return D
\ No newline at end of file
+    del D["include"]
+    return D
+
+def getDefinitionBlocks(text):
+    block = []
+    block_tmp = re.findall(r"/\*{2}\s*([^*]*\*(?:[^/*][^*]*\*+)*)/\s*#define\s+(.*?)\s*?$", text, re.MULTILINE)
+    for comment, define in block_tmp:
+        block.append((" ".join(re.findall(r"^\s*\*?\s*(.*?)\s*?$", comment, re.MULTILINE)), define))
+    block += re.findall(r"/{3}<?\s*(.*)\s*#define\s+(.*)\s*?$", text, re.MULTILINE)
+    block += [(comment, define) for define, comment in re.findall(r"#define\s*(.*?)\s*/{3}<\s*(.*?)\s*?$", text, re.MULTILINE)]
+    return block
+
+def loadModuleInfos(path):
+    moduleInfos = {}
+    for definition in findDefinitions(const.MODULE_CONFIGURATION, path):
+        moduleName = definition[0].replace("cfg_", "").replace(".h", "")
+        moduleInfos[moduleName] = []
+        for element in getDefinitionBlocks(open(definition[1] + "/" + definition[0], "r").read()):
+            moduleInfos[moduleName].append(element)
+    return moduleInfos