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

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index 89998949..fc225d0a 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,13 @@ 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("^/\*+\s*(.*?)\s*?\*/\s*#define\s+(\w+[\s\w]*?)\s*$", text, re.DOTALL | re.MULTILINE)
+    for comment, define in block_tmp:
+        block.append((" ".join(re.findall("^\s*\*?\s*(.*?)\s*?$", comment, re.MULTILINE)), define))
+    block += re.findall("/{3}<?\s*(.*)\s*#define\s+(.*)\s*?$", text, re.MULTILINE)
+    return block
\ No newline at end of file