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

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index a946d970..fc225d0a 100644
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -38,19 +38,35 @@ def getSystemPath():
 def findToolchains(pathList):
     toolchains = []
     for element in pathList:
-        toolchains += glob.glob(element+ "/" + const.GCC_NAME)
-    return toolchains
+        for toolchain in glob.glob(element+ "/" + const.GCC_NAME):
+            if not os.path.islink(toolchain):
+                toolchains.append(toolchain)
+    return list(set(toolchains))
 
 def getToolchainInfo(output):
     info = {}
     expr = re.compile("Target: .*")
-    info["target"] = expr.findall(output)[0].split("Target: ")[1]
-    expr = re.compile("gcc version .*")
-    info["version"] = expr.findall(output)[0].split("gcc version ")[1]
+    target = expr.findall(output)
+    if len(target) == 1:
+        info["target"] = target[0].split("Target: ")[1]
+    expr = re.compile("gcc version [0-9,.]*")
+    version = expr.findall(output)
+    if len(version) == 1:
+        info["version"] = version[0].split("gcc version ")[1]
+    expr = re.compile("gcc version [0-9,.]* \(.*\)")
+    build = expr.findall(output)
+    if len(build) == 1:
+        build = build[0].split("gcc version ")[1]
+        build = build[build.find("(") + 1 : build.find(")")]
+        info["build"] = build
     expr = re.compile("Configured with: .*")
-    info["configured"] = expr.findall(output)[0].split("Configured with: ")[1]
+    configured = expr.findall(output)
+    if len(configured) == 1:
+        info["configured"] = configured[0].split("Configured with: ")[1]
     expr = re.compile("Thread model: .*")
-    info["thread"] = expr.findall(output)[0].split("Thread model: ")[1]
+    thread = expr.findall(output)
+    if len(thread) == 1:
+        info["thread"] = thread[0].split("Thread model: ")[1]
     return info
 
 def findDefinitions(ftype, path):
@@ -63,12 +79,25 @@ def findDefinitions(ftype, path):
 def loadCpuInfos(path):
     cpuInfos = []
     for definition in findDefinitions(const.CPU_DEFINITION, path):
-        D = {}
-        D.update(const.CPU_DEF)
-        def include(filename, dict = D, directory=definition[1]):
-            execfile(directory + "/" + filename, {}, D)
-        D["include"] = include
-        include(definition[0], D)
-        D["CPU_NAME"] = definition[0].split(".")[0]
-        cpuInfos.append(D)
+        cpuInfos.append(getInfos(definition))
     return cpuInfos
+
+def getInfos(definition):
+    D = {}
+    D.update(const.CPU_DEF)
+    def include(filename, dict = D, directory=definition[1]):
+        execfile(directory + "/" + filename, {}, D)
+    D["include"] = include
+    include(definition[0], D)
+    D["CPU_NAME"] = definition[0].split(".")[0]
+    D["DEFINITION_PATH"] = definition[1] + "/" + definition[0]
+    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