Clean up whitespace.

[bertos.git] / wizard / bertos_utils.py

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index 4af4947a0a735bb02eb2e45eb27065f94167d50e..99a84414cae75b30970ef6a2b40fb128e739b66b 100644 (file)
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -12,6 +12,7 @@
 import os
 import fnmatch
 import glob
+import re
 
 import const
 
@@ -40,6 +41,26 @@ def findToolchains(pathList):
         toolchains += glob.glob(element+ "/" + const.GCC_NAME)
     return toolchains
 
+def getToolchainInfo(output):
+    info = {}
+    expr = re.compile("Target: .*")
+    target = expr.findall(output)
+    if len(target) == 1:
+        info["target"] = target[0].split("Target: ")[1]
+    expr = re.compile("gcc version .*")
+    version = expr.findall(output)
+    if len(version) == 1:
+        info["version"] = version[0].split("gcc version ")[1]
+    expr = re.compile("Configured with: .*")
+    configured = expr.findall(output)
+    if len(configured) == 1:
+        info["configured"] = configured[0].split("Configured with: ")[1]
+    expr = re.compile("Thread model: .*")
+    thread = expr.findall(output)
+    if len(thread) == 1:
+        info["thread"] = thread[0].split("Thread model: ")[1]
+    return info
+
 def findDefinitions(ftype, path):
     L = os.walk(path)
     for element in L:
@@ -50,12 +71,16 @@ 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]
+    return D
\ No newline at end of file