Use defaultdict for toolchains information

[bertos.git] / wizard / bertos_utils.py

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index ed66a3b80d3e67ee2067dda814aa997624909d05..8f91878d151a71fceea48b00f71494eeb9141741 100644 (file)
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -38,8 +38,10 @@ 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 = {}
@@ -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:
@@ -71,12 +79,17 @@ 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