Modify orribly the conversion module and the bertos_utils module for make it compatib...

[bertos.git] / wizard / bertos_utils.py

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index 99a84414cae75b30970ef6a2b40fb128e739b66b..2f755c38af8576c31dbc96c03d5b8032f6d1b0b8 100644 (file)
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -38,7 +38,9 @@ def getSystemPath():
 def findToolchains(pathList):
     toolchains = []
     for element in pathList:
-        toolchains += glob.glob(element+ "/" + const.GCC_NAME)
+        for toolchain in glob.glob(element+ "/" + const.GCC_NAME):
+            if not os.path.islink(toolchain):
+                toolchains.append(toolchain)
     return toolchains
 
 def getToolchainInfo(output):
@@ -47,10 +49,16 @@ def getToolchainInfo(output):
     target = expr.findall(output)
     if len(target) == 1:
         info["target"] = target[0].split("Target: ")[1]
-    expr = re.compile("gcc version .*")
+    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: .*")
     configured = expr.findall(output)
     if len(configured) == 1:
@@ -83,4 +91,5 @@ 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